3.4.0 bug修复

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -84,6 +84,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     private static final Logger logger = LoggerFactory.getLogger(ExamTaskServiceImpl.class);
 
+    @Resource
+    private BasicExamRuleService basicExamRuleService;
     @Resource
     private BasicExamStudentService basicExamStudentService;
     @Resource
@@ -1635,10 +1637,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 list2 = ExamDetailCourses.stream().map(ExamDetailCourse::getPaperNumber).distinct().collect(Collectors.toList());
             }
             list.addAll(list2);
-            return list.stream().filter(m->!m.endsWith("作废")).distinct().collect(Collectors.toList());
+            return list.stream().filter(m -> !m.endsWith("作废")).distinct().collect(Collectors.toList());
         } else {
             List<String> paperNumberList = examDetailCourseService.listPaperNumberByPrintPlanId(param, printPlanIdList, orgIds);
-            return paperNumberList.stream().filter(m->!m.endsWith("作废")).distinct().collect(Collectors.toList());
+            return paperNumberList.stream().filter(m -> !m.endsWith("作废")).distinct().collect(Collectors.toList());
         }
     }
 
@@ -1819,6 +1821,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             return Stream.of(map);
         }).distinct().collect(Collectors.toList());
 
+        BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId(sysUser.getSchoolId());
+        Optional<EnumResult> optional = basicExamRule.getRequiredFieldList().stream().filter(m -> RequiredFieldsEnum.EXAM_PLACE.getCode().equals(m.getCode())).findFirst();
+
         List<ExamDetail> examDetailList = new ArrayList<>();
         for (Map<String, Object> map : examDetailKeyList) {
             Long schoolId = Long.valueOf(String.valueOf(map.get("schoolId")));
@@ -1826,10 +1831,17 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             String examRoom = String.valueOf(map.get("examRoom"));
             Long examStartTime = Long.valueOf(String.valueOf(map.get("examStartTime")));
             Long examEndTime = Long.valueOf(String.valueOf(map.get("examEndTime")));
+            List<BasicExamStudent> examDetailStudentList;
 
-            List<BasicExamStudent> examDetailStudentList = basicExamStudentList.stream().filter(e -> e.getExamPlace().equals(examPlace) &&
-                            e.getExamRoom().equals(examRoom) && e.getExamStartTime().equals(examStartTime) && e.getExamEndTime().equals(examEndTime))
-                    .collect(Collectors.toList());
+            if (optional.isPresent() && optional.get().getEnable()) {
+                examDetailStudentList = basicExamStudentList.stream().filter(e -> e.getExamPlace().equals(examPlace) &&
+                                e.getExamRoom().equals(examRoom) && e.getExamStartTime().equals(examStartTime) && e.getExamEndTime().equals(examEndTime))
+                        .collect(Collectors.toList());
+            } else {
+                examDetailStudentList = basicExamStudentList.stream().filter(e ->
+                                e.getExamRoom().equals(examRoom) && e.getExamStartTime().equals(examStartTime) && e.getExamEndTime().equals(examEndTime))
+                        .collect(Collectors.toList());
+            }
 
             ExamDetail examDetail = new ExamDetail();
             examDetail.setId(SystemConstant.getDbUuid());