Browse Source

[bug]考务数据导入-填充考务-课程表 科次字段

caozixuan 4 years ago
parent
commit
cfa5240b85

+ 20 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamDetailServiceImpl.java

@@ -15,6 +15,7 @@ import com.qmth.distributed.print.business.bean.result.ExaminationResult;
 import com.qmth.distributed.print.business.bean.result.SummarizedDataResult;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
+import com.qmth.distributed.print.business.enums.ExaminationDBFieldsEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.mapper.ExamDetailMapper;
@@ -427,6 +428,24 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             String courseCode = String.valueOf(map.get("courseCode"));
             String courseName = String.valueOf(map.get("courseName"));
             String paperNumber = String.valueOf(map.get("paperNumber"));
+
+            // 获取该科目下的考生人数
+            List<Map<String,Object>> sameCourseList = dataList.stream().filter(e -> Long.valueOf(String.valueOf(e.get("schoolId"))).equals(schoolId) &&
+                    Long.valueOf(String.valueOf(e.get("printPlanId"))).equals(printPlanId) &&
+                    String.valueOf(e.get("examPlace")).equals(examPlace) &&
+                    String.valueOf(e.get("examRoom")).equals(examRoom) &&
+                    Long.valueOf(String.valueOf(e.get("examStartTime"))).equals(examStartTime) &&
+                    Long.valueOf(String.valueOf(e.get("examEndTime"))).equals(examEndTime) &&
+                    String.valueOf(e.get("courseCode")).equals(courseCode) &&
+                    String.valueOf(e.get("courseName")).equals(courseName) &&
+                    String.valueOf(e.get("paperNumber")).equals(paperNumber)).collect(Collectors.toList());
+
+            System.out.println(JSON.toJSONString(sameCourseList));
+
+            int totalSubjects = sameCourseList.size();
+
+
+
             List<ExamDetail> examDetailList = this.list(new QueryWrapper<ExamDetail>().lambda()
                     .eq(ExamDetail::getPrintPlanId, printPlanId)
                     .eq(ExamDetail::getExamPlace, examPlace)
@@ -444,6 +463,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             examDetailCourse.setCourseCode(courseCode);
             examDetailCourse.setCourseName(courseName);
             examDetailCourse.setPaperNumber(paperNumber);
+            examDetailCourse.setTotalSubjects(totalSubjects);
             examDetailCourse.setCreateId(userId);
             examDetailCourse.setUpdateId(userId);
             examDetailCourseList.add(examDetailCourse);

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -363,7 +363,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         ExamPrintPlan examPrintPlan = examPrintPlanService.getById(printPlanId);
 
         if (examPrintPlan == null) {
-            throw ExceptionResultEnum.ERROR.exception("印刷计划不存在printPlanId : " + printPlanId);
+            throw ExceptionResultEnum.ERROR.exception("[印刷计划]不存在");
         }
 
         PrintPlanStatusEnum printPlanStatus = examPrintPlan.getStatus();