diff --git a/src/main/java/com/zcloud/controller/archives/ArchivesController.java b/src/main/java/com/zcloud/controller/archives/ArchivesController.java index 4effb2b..1a4b023 100644 --- a/src/main/java/com/zcloud/controller/archives/ArchivesController.java +++ b/src/main/java/com/zcloud/controller/archives/ArchivesController.java @@ -1544,7 +1544,11 @@ public class ArchivesController extends BaseController { String[] industryList = classInfo.getString("INDUSTRY_ALL_TYPE").split(","); if (classInfo.getString("POSTTYPE").equals("d302da12d8724faaa24e5008adab8ce8")) { //岗位类型:三级教育培训 if (industryList[0].equals("1b250e1ec1e24576aaa84daa804e9ab2")) { //高危行业 - context.put("examinevalue14", classInfo.getString("TRAINLEVEL_NAME") + "安全培训考核记录"); //培训级别+固定值 + if (Tools.notEmpty(classInfo.getString("TRAINLEVEL_NAME"))) { + context.put("examinevalue14", classInfo.getString("TRAINLEVEL_NAME") + "安全培训考核记录"); //培训级别+固定值 + } else { + context.put("examinevalue14", "安全培训考核记录"); //培训级别+固定值 + } } else { if (Tools.isEmpty(classInfo.getString("TRAINLEVEL_NAME"))){ context.put("examinevalue14", "一般行业生产经营单位新入职从业人员安全培训考核记录"); //固定值+培训级别 diff --git a/src/main/java/com/zcloud/util/ClassScheduled.java b/src/main/java/com/zcloud/util/ClassScheduled.java index 4e96607..e98f2dd 100644 --- a/src/main/java/com/zcloud/util/ClassScheduled.java +++ b/src/main/java/com/zcloud/util/ClassScheduled.java @@ -19,8 +19,8 @@ public class ClassScheduled { private StageStudentRelationService stageStudentRelationService; -// @Scheduled(cron ="0 30 0 * * ?") // 每天晚上12:30执行 - @Scheduled(cron ="0 0/2 * * * ?") // 测试 每5分钟执行一次 + @Scheduled(cron ="0 30 0 * * ?") // 每天晚上12:30执行 +// @Scheduled(cron ="0 0/2 * * * ?") // 测试 每5分钟执行一次 public void scheduled(){ try { PageData pd = new PageData(); diff --git a/src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java b/src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java index 1bc5ac3..6fc2d6d 100644 --- a/src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java +++ b/src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java @@ -99,7 +99,7 @@ public class StudentSumTableAbsHandler extends AbsHandlerBatchExport { IContext context = report.createContext(); DecimalFormat df = new DecimalFormat("0.0"); SimpleDateFormat formatdate = new SimpleDateFormat("yyyy年MM月dd日"); - context.put("value1", corpinfo.getString("NAME")); //平台名称 +// context.put("value1", corpinfo.getString("NAME")); //平台名称 context.put("value2", clazz.getString("enterpriseName")); //公司名称 context.put("value3", clazz.getString("NAME")); // 任务名称 String START_TIME = ""; diff --git a/src/main/webapp/uploadFiles/wordTemplate/studentsumtable-new.docx b/src/main/webapp/uploadFiles/wordTemplate/studentsumtable-new.docx index 266fa4a..c98752e 100644 --- a/src/main/webapp/uploadFiles/wordTemplate/studentsumtable-new.docx +++ b/src/main/webapp/uploadFiles/wordTemplate/studentsumtable-new.docx @@ -1,5 +1,5 @@ 学员考核成绩统计表 -平台名称:<<${value1}>> + 报表日期:<<${value8}>> 公司名称 <<${value2}>>