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

人员和教育培训修改

Browse Source
This commit is contained in:
pengjie 2024-05-24 17:59:19 +08:00
parent 2702f5975b
commit a546bb7fcf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainRecordServiceImpl.java
View File

@ -79,7 +79,7 @@ public class ExamTrainRecordServiceImpl extends ServiceImpl<ExamTrainRecordMappe
} }
examTrainRecord.setExamNum(1); examTrainRecord.setExamNum(1);
examTrainRecord.setScore(score); examTrainRecord.setScore(score);
examTrainRecord.setIsPass(score > examTrain.getPassLine() ? 1 : 0); examTrainRecord.setIsPass(score >= examTrain.getPassLine() ? 1 : 0);
long duration = DateUtil.between(examTrainRecord.getStartExamTime(), new Date(), DateUnit.SECOND) * 1000; long duration = DateUtil.between(examTrainRecord.getStartExamTime(), new Date(), DateUnit.SECOND) * 1000;
examTrainRecord.setDuration(DateUtil.formatBetween(duration)); examTrainRecord.setDuration(DateUtil.formatBetween(duration));
examTrainRecord.setTotalScore(examPaper.getTotalScore()); examTrainRecord.setTotalScore(examPaper.getTotalScore());

2
src/main/java/com/zhgd/xmgl/task/ExamTask.java
View File

@ -70,7 +70,7 @@ public class ExamTask {
if (examNoticeConfig.getExamNum() != null && examNoticeConfig.getExamType() != null) { if (examNoticeConfig.getExamNum() != null && examNoticeConfig.getExamType() != null) {
List<ExamTrain> examTrainList = examTrainService.list(Wrappers.<ExamTrain>lambdaQuery().eq(ExamTrain::getProjectSn, list.get(i).getProjectSn())); List<ExamTrain> examTrainList = examTrainService.list(Wrappers.<ExamTrain>lambdaQuery().eq(ExamTrain::getProjectSn, list.get(i).getProjectSn()));
for (int j = 0; j < examTrainList.size(); j++) { for (int j = 0; j < examTrainList.size(); j++) {
if (DateUtil.compare(examTrainList.get(j).getTrainBeginTime(), getTime(examNoticeConfig.getExamType(), examNoticeConfig.getExamNum())) < 0) { if (DateUtil.compare(examTrainList.get(j).getTrainBeginTime(), getTime(examNoticeConfig.getExamType(), examNoticeConfig.getExamNum())) <= 0) {
List<ExamTrainRecord> examTrainRecordList = examTrainRecordService.list(Wrappers.<ExamTrainRecord>lambdaQuery().eq(ExamTrainRecord::getTrainId, examTrainList.get(j).getId())); List<ExamTrainRecord> examTrainRecordList = examTrainRecordService.list(Wrappers.<ExamTrainRecord>lambdaQuery().eq(ExamTrainRecord::getTrainId, examTrainList.get(j).getId()));
for (int i1 = 0; i1 < examTrainRecordList.size(); i1++) { for (int i1 = 0; i1 < examTrainRecordList.size(); i1++) {
if (examTrainRecordList.get(i1).getScore() == null) { if (examTrainRecordList.get(i1).getScore() == null) {