From 7e28167b2e1e865e5e3b76fd199976aa9023e849 Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Thu, 21 May 2026 15:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E5=BB=BA=E6=A1=A3?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E3=80=81=E8=80=83=E6=A0=B8=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E5=BD=92=E6=A1=A3=E6=97=A5=E6=9C=9F=E3=80=81=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E6=88=90=E7=BB=A9=E7=BB=9F=E8=AE=A1=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=97=A5=E6=9C=9F=E7=BB=9F=E4=B8=80=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=8F=AD=E7=BA=A7=E7=9A=84=E7=BB=93=E6=9D=9F=E6=97=A5?= =?UTF-8?q?=E3=80=82=20=E8=AF=95=E9=A2=98=E7=9A=84=E8=80=83=E8=AF=95?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/ArchivesController.java | 20 +++++++++---------- .../StudentSumTableAbsHandler.java | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zcloud/controller/archives/ArchivesController.java b/src/main/java/com/zcloud/controller/archives/ArchivesController.java index 1a4b023..0a70da4 100644 --- a/src/main/java/com/zcloud/controller/archives/ArchivesController.java +++ b/src/main/java/com/zcloud/controller/archives/ArchivesController.java @@ -929,10 +929,10 @@ public class ArchivesController extends BaseController { PageData notParticiPatingPaper = stageExamService.findByPaperUserNotPart(pd); if (notParticiPatingPaper != null) { // 班级需要考 - notParticiPatingPaper.put("EXAMTIMEEND", " "); + notParticiPatingPaper.put("EXAMTIMEEND", ""); notParticiPatingPaper.put("EXAMSCORE",notParticiPatingPaper.getString("STAGEEXAMSCORE")); if (notParticiPatingPaper.getString("STAGEEXAMSCORE").equals("-1")){ - notParticiPatingPaper.put("EXAMSCORE", " "); + notParticiPatingPaper.put("EXAMSCORE", ""); } List questionList = stageExamRecordService.findByExamNotPart(notParticiPatingPaper); notParticiPatingPaper.put("QUESTIONLIST", questionList); @@ -1026,8 +1026,8 @@ public class ArchivesController extends BaseController { paper = stageExamService.findByPaperUserNotPart(pd); if (paper != null) { // 班级需要考 - paper.put("EXAMTIMEEND", " "); - paper.put("EXAMSCORE", " "); + paper.put("EXAMTIMEEND", ""); + paper.put("EXAMSCORE", ""); List questionList2 = stageExamRecordService.findByExamNotPart(paper); paper.put("QUESTIONLIST", questionList2); } @@ -1188,8 +1188,8 @@ public class ArchivesController extends BaseController { context.put("value1", Tools.notEmpty(student.getString("FILE_NUMBER")) ? student.getString("FILE_NUMBER") : ""); // 档案编号 context.put("value2", student.getString("STUDENT_NAME") != null ? student.getString("STUDENT_NAME") : student.getString("NAME")); // 姓名 context.put("value3", student.getString("USER_ID_CARD")); // 身份证号 - if (student.getString("START_TIME") != null) { - String str = String.valueOf(student.getString("START_TIME")); + if (student.getString("END_TIME") != null) { + String str = String.valueOf(student.getString("END_TIME")); StringBuilder sb = new StringBuilder(str); sb.setCharAt(4, '年'); sb.setCharAt(7, '月'); @@ -1347,11 +1347,11 @@ public class ArchivesController extends BaseController { if (paper != null) { context.put("value15", Tools.notEmpty(paper.getString("EXAMNAME")) ? paper.getString("EXAMNAME") : ""); //试卷名称 context.put("value16", Tools.notEmpty(paper.getString("PAPEREXAMSCORE")) ? paper.getString("PAPEREXAMSCORE") : ""); //满分 + SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd"); //日期格式 if (Tools.notEmpty(paper.getString("CREATTIME"))) { - SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd"); //日期格式 paper.put("CREATTIME", dateformat.format(dateformat.parse(paper.getString("CREATTIME")))); } - context.put("value19", Tools.notEmpty(paper.getString("EXAMTIMEEND")) ? paper.getString("EXAMTIMEEND") : "未参加考试"); //考试时间 + context.put("value19", Tools.notEmpty(paper.getString("EXAMTIMEEND")) ? dateformat.format(dateformat.parse(paper.getString("EXAMTIMEEND"))) : "未参加考试"); //考试时间 context.put("value20", Tools.notEmpty(paper.getString("EXAMSCORE")) ? paper.getString("EXAMSCORE") : ""); //考试成绩 if (paper.get("QUESTIONLIST") != null) { ArrayList arr = (ArrayList) paper.get("QUESTIONLIST"); @@ -1529,8 +1529,8 @@ public class ArchivesController extends BaseController { context.put("pic5", ""); } - if (student.getString("STUDY_END_TIME") != null) { - String str = String.valueOf(student.getString("STUDY_END_TIME")); + if (student.getString("END_TIME") != null) { + String str = String.valueOf(student.getString("END_TIME")); StringBuilder sb = new StringBuilder(str); sb.setCharAt(4, '年'); sb.setCharAt(7, '月'); diff --git a/src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java b/src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java index 6fc2d6d..a8e33ed 100644 --- a/src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java +++ b/src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java @@ -118,7 +118,7 @@ public class StudentSumTableAbsHandler extends AbsHandlerBatchExport { context.put("value5", "0.0".equals(classhour) ? "0" : df.format(classhour)); // 计划课时 context.put("value6", studentList.size());//培训人数 context.put("value7", passStudent.size() == 0 ? "0" : passStudent.size());//合格人数 - context.put("value8", formatdate.format(new Date()));//报表日期 + context.put("value8", formatdate.format(new Date(END_TIME)));//报表日期 List list1 = new ArrayList<>(); //一共多少行 for (int i = 0; i < passStudent.size(); i++) { TrainingPlanDao trainingPlanDao = new TrainingPlanDao(); //每行的内容实体类