admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

按模版导出人员安全教育信息bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-11-25 18:07:41 +08:00
parent f5e132fd93
commit b9ff5f0035
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -1925,7 +1925,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
WorkerType workerType = workerTypeMapper.selectById(entityMap.get("workerTypeId"));
List<WorkerSafeEducation> workerSafeEducations = workerSafeEducationMapper.selectList(Wrappers.<WorkerSafeEducation>lambdaQuery()
.eq(WorkerSafeEducation::getProjectSn, projectSn)
.eq(WorkerSafeEducation::getEduType, 1).last(Cts.IGNORE_DATA_SCOPE_CONDITION)
.eq(WorkerSafeEducation::getEduType, 1).apply(Cts.IGNORE_DATA_SCOPE_CONDITION_APPLY)
.orderByDesc(WorkerSafeEducation::getAddTime));
if (workerSafeEducations == null || workerSafeEducations.size() == 0) {
throw new OpenAlertException("该人员未参加过入场安全教育培训!");

6
src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
View File

@ -353,8 +353,10 @@ public class ExcelUtils {
for (String s : map.keySet()) {
placeholderMap.put("${" + s + "}", map.get(s));
}
placeholderMap.put("${studyTime}", workerSafeEducationWorker.getStudyTime());
placeholderMap.put("${score}", workerSafeEducationWorker.getScore());
if (workerSafeEducationWorker != null) {
placeholderMap.put("${studyTime}", workerSafeEducationWorker.getStudyTime());
placeholderMap.put("${score}", workerSafeEducationWorker.getScore());
}
placeholderMap.put("${workerTypeName}", workerType.getTypeName());
// 替换占位符
for (Row row : sheet) {