exam-org
/
qa-education-exam-org
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页的建档日期、考核记录的归档日期、考核成绩统计表的报表日期统一改为班级的结束日。 

试题的考试时间只显示日期
main
zhangyanli 2026-05-21 15:11:02 +08:00
parent e0d626622d
commit 7e28167b2e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/zcloud/controller/archives/ArchivesController.java
View File

@ -929,10 +929,10 @@ public class ArchivesController extends BaseController {
PageData notParticiPatingPaper = stageExamService.findByPaperUserNotPart(pd); PageData notParticiPatingPaper = stageExamService.findByPaperUserNotPart(pd);
if (notParticiPatingPaper != null) { if (notParticiPatingPaper != null) {
// 班级需要考 // 班级需要考
notParticiPatingPaper.put("EXAMTIMEEND", " "); notParticiPatingPaper.put("EXAMTIMEEND", "");
notParticiPatingPaper.put("EXAMSCORE",notParticiPatingPaper.getString("STAGEEXAMSCORE")); notParticiPatingPaper.put("EXAMSCORE",notParticiPatingPaper.getString("STAGEEXAMSCORE"));
if (notParticiPatingPaper.getString("STAGEEXAMSCORE").equals("-1")){ if (notParticiPatingPaper.getString("STAGEEXAMSCORE").equals("-1")){
notParticiPatingPaper.put("EXAMSCORE", " "); notParticiPatingPaper.put("EXAMSCORE", "");
} }
List<PageData> questionList = stageExamRecordService.findByExamNotPart(notParticiPatingPaper); List<PageData> questionList = stageExamRecordService.findByExamNotPart(notParticiPatingPaper);
notParticiPatingPaper.put("QUESTIONLIST", questionList); notParticiPatingPaper.put("QUESTIONLIST", questionList);
@ -1026,8 +1026,8 @@ public class ArchivesController extends BaseController {
paper = stageExamService.findByPaperUserNotPart(pd); paper = stageExamService.findByPaperUserNotPart(pd);
if (paper != null) { if (paper != null) {
// 班级需要考 // 班级需要考
paper.put("EXAMTIMEEND", " "); paper.put("EXAMTIMEEND", "");
paper.put("EXAMSCORE", " "); paper.put("EXAMSCORE", "");
List<PageData> questionList2 = stageExamRecordService.findByExamNotPart(paper); List<PageData> questionList2 = stageExamRecordService.findByExamNotPart(paper);
paper.put("QUESTIONLIST", questionList2); 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("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("value2", student.getString("STUDENT_NAME") != null ? student.getString("STUDENT_NAME") : student.getString("NAME")); // 姓名
context.put("value3", student.getString("USER_ID_CARD")); // 身份证号 context.put("value3", student.getString("USER_ID_CARD")); // 身份证号
if (student.getString("START_TIME") != null) { if (student.getString("END_TIME") != null) {
String str = String.valueOf(student.getString("START_TIME")); String str = String.valueOf(student.getString("END_TIME"));
StringBuilder sb = new StringBuilder(str); StringBuilder sb = new StringBuilder(str);
sb.setCharAt(4, '年'); sb.setCharAt(4, '年');
sb.setCharAt(7, '月'); sb.setCharAt(7, '月');
@ -1347,11 +1347,11 @@ public class ArchivesController extends BaseController {
if (paper != null) { if (paper != null) {
context.put("value15", Tools.notEmpty(paper.getString("EXAMNAME")) ? paper.getString("EXAMNAME") : ""); //试卷名称 context.put("value15", Tools.notEmpty(paper.getString("EXAMNAME")) ? paper.getString("EXAMNAME") : ""); //试卷名称
context.put("value16", Tools.notEmpty(paper.getString("PAPEREXAMSCORE")) ? paper.getString("PAPEREXAMSCORE") : ""); //满分 context.put("value16", Tools.notEmpty(paper.getString("PAPEREXAMSCORE")) ? paper.getString("PAPEREXAMSCORE") : ""); //满分
if (Tools.notEmpty(paper.getString("CREATTIME"))) {
SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd"); //日期格式 SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd"); //日期格式
if (Tools.notEmpty(paper.getString("CREATTIME"))) {
paper.put("CREATTIME", dateformat.format(dateformat.parse(paper.getString("CREATTIME")))); 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") : ""); //考试成绩 context.put("value20", Tools.notEmpty(paper.getString("EXAMSCORE")) ? paper.getString("EXAMSCORE") : ""); //考试成绩
if (paper.get("QUESTIONLIST") != null) { if (paper.get("QUESTIONLIST") != null) {
ArrayList arr = (ArrayList) paper.get("QUESTIONLIST"); ArrayList arr = (ArrayList) paper.get("QUESTIONLIST");
@ -1529,8 +1529,8 @@ public class ArchivesController extends BaseController {
context.put("pic5", ""); context.put("pic5", "");
} }
if (student.getString("STUDY_END_TIME") != null) { if (student.getString("END_TIME") != null) {
String str = String.valueOf(student.getString("STUDY_END_TIME")); String str = String.valueOf(student.getString("END_TIME"));
StringBuilder sb = new StringBuilder(str); StringBuilder sb = new StringBuilder(str);
sb.setCharAt(4, '年'); sb.setCharAt(4, '年');
sb.setCharAt(7, '月'); sb.setCharAt(7, '月');

2
src/main/java/com/zcloud/util/archivesUtil/StudentSumTableAbsHandler.java
View File

@ -118,7 +118,7 @@ public class StudentSumTableAbsHandler extends AbsHandlerBatchExport {
context.put("value5", "0.0".equals(classhour) ? "0" : df.format(classhour)); // 计划课时 context.put("value5", "0.0".equals(classhour) ? "0" : df.format(classhour)); // 计划课时
context.put("value6", studentList.size());//培训人数 context.put("value6", studentList.size());//培训人数
context.put("value7", passStudent.size() == 0 ? "0" : passStudent.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<TrainingPlanDao> list1 = new ArrayList<>(); //一共多少行 List<TrainingPlanDao> list1 = new ArrayList<>(); //一共多少行
for (int i = 0; i < passStudent.size(); i++) { for (int i = 0; i < passStudent.size(); i++) {
TrainingPlanDao trainingPlanDao = new TrainingPlanDao(); //每行的内容实体类 TrainingPlanDao trainingPlanDao = new TrainingPlanDao(); //每行的内容实体类