3.4.0 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/approvalForm/ExamPackageDetail.java

@@ -53,7 +53,7 @@ public class ExamPackageDetail {
     private Integer examDetailCourseTotalSubjects;
 
     @ApiModelProperty(value = "考察课程表班级合计")
-    private String clazzIds;
+    private String classNames;
 
     @ApiModelProperty(value = "印刷计划id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -181,12 +181,12 @@ public class ExamPackageDetail {
         this.examDetailCourseTotalSubjects = examDetailCourseTotalSubjects;
     }
 
-    public String getClazzIds() {
-        return clazzIds;
+    public String getClassNames() {
+        return classNames;
     }
 
-    public void setClazzIds(String clazzIds) {
-        this.clazzIds = clazzIds;
+    public void setClassNames(String classNames) {
+        this.classNames = classNames;
     }
 
     public Long getExamPrintPlanId() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -69,7 +69,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
      * @param printPlanStatusEnumList 印刷计划状态集合
      * @return 数据集
      */
-    List<ExamPackageDetail> findExamPackageDetailByPaperNumber(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("printPlanStatusEnumList") List<PrintPlanStatusEnum> printPlanStatusEnumList);
+    List<ExamPackageDetail> findExamPackageDetailByPaperNumber(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseId") Long courseId, @Param("paperNumber") String paperNumber, @Param("printPlanStatusEnumList") List<PrintPlanStatusEnum> printPlanStatusEnumList);
 
     ExamTask findByFlowId(@Param("flowId") Long flowId);
 

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

@@ -175,7 +175,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
             printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
             printPlanStatusEnumList.add(PrintPlanStatusEnum.FINISH);
-            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examId, record.getCourseCode(), cellPaperNumber, printPlanStatusEnumList);
+            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examId, record.getCourseId(), cellPaperNumber, printPlanStatusEnumList);
             record.setApproveFormStatus(examPackageDetailDatasource.size() > 0);
         }
         return examTaskDtoIPage;
@@ -1258,7 +1258,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         }
                     }
                 } else if (ExamModelEnum.MODEL2.equals(basicExam.getExamModel())) {
-                    if (StringUtils.isNotBlank(examDetailParams.getClassName()) && !MapUtils.isNotEmpty(usedClassNameMap)) {
+                    if (StringUtils.isNotBlank(examDetailParams.getClassName()) && MapUtils.isNotEmpty(usedClassNameMap)) {
                         for (String s : examDetailParams.getClassName().split(",")) {
                             if (usedClassNameMap.containsKey(s)) {
                                 errorClassNames.add(s);
@@ -1396,7 +1396,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
 
         // 2.ExamRoomInfo 部分
-        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getExamId(), examTask.getCourseCode(), examTask.getPaperNumber(), null);
+        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getExamId(), examTask.getCourseId(), examTask.getPaperNumber(), null);
         if (examPackageDetailDatasource.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("缺少该命题任务对应的考务数据");
         }
@@ -1465,7 +1465,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         if (Objects.isNull(examTask)) {
             throw ExceptionResultEnum.ERROR.exception("未找到命题任务");
         }
-        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getExamId(), examTask.getCourseCode(), paperNumber, null);
+        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getExamId(), examTask.getCourseId(), paperNumber, null);
         ExamObjectDto examObjectDto = this.buildExamObjectDtoByPackageDatasource(examPackageDetailDatasource);
 
         examObjectDto.setPaperName(examTask.getPaperName());
@@ -2154,7 +2154,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             for (Long examDetailId : examDetailIdSet) {
                 // 一个考场下
                 // 班级
-                String classNames = "";
                 int studentCount = 0;
                 String printCount = "";
 
@@ -2183,7 +2182,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 }
 
                 // 班级主键','隔开
-                List<Long> clazzIds = new ArrayList<>();
+                List<String> clazzNames = new ArrayList<>();
                 String separator = ",";
                 for (ExamPackageDetail examPackageDetail : examPackageDetailCell) {
                     // 处理考试开始结束时间
@@ -2198,10 +2197,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     // 处理班级和数量
                     Integer studentCellCount = examPackageDetail.getExamDetailCourseTotalSubjects();
                     studentCount = studentCount + studentCellCount;
-                    String clazzIdCell = examPackageDetail.getClazzIds();
+                    String clazzIdCell = examPackageDetail.getClassNames();
                     if (StringUtils.isNotBlank(clazzIdCell)) {
                         for (String s : clazzIdCell.split(separator)) {
-                            clazzIds.add(Long.valueOf(s));
+                            clazzNames.add(s);
                         }
                     }
                 }
@@ -2213,11 +2212,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 // 组装examRoom
                 ExamRoomInfo examRoomInfo = new ExamRoomInfo();
                 examRoomInfo.setPackageCode(packageCode);
-                if (!CollectionUtils.isEmpty(clazzIds)) {
-                    classNames = examDetailService.findClazzNamesByClazzIds(clazzIds, separator);
-//                    examRoomInfo.setCampusNames(basicCampusService.findCampusNamesByClazzIdList(clazzIds, ","));
-                }
-                examRoomInfo.setClazzNames(classNames);
+                examRoomInfo.setClazzNames(CollectionUtils.isNotEmpty(clazzNames) ? String.join(",", clazzNames) : "");
                 examRoomInfo.setStudentCount(studentCount);
                 examRoomInfo.setPrintCount(printCount);
                 examRoomInfo.setPrintHouseName(printHourseName);

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -33,6 +33,7 @@
         SELECT
         a.id,
         a.school_id schoolId,
+        a.course_id courseId,
         bc.code courseCode,
         bc.name courseName,
         a.sequence,
@@ -916,11 +917,11 @@
             ed.status AS examDetailStatus,
             IFNULL((select t.name from sys_org t where t.id = ed.print_house_id),'-') as printHouseName,
             edc.id AS examDetailCourseId,
-            edc.course_code AS courseCode,
-            edc.course_name AS courseName,
+            bc.code AS courseCode,
+            bc.name AS courseName,
             edc.paper_number AS paperNumber,
             edc.total_subjects AS examDetailCourseTotalSubjects,
-            edc.clazz_id AS clazzIds,
+            edc.clazz_name AS classNames,
             epp.id AS examPrintPlanId,
             epp.name AS examPrintPlanName,
             epp.print_content AS printContent,
@@ -933,6 +934,8 @@
             exam_detail_course edc ON edc.exam_detail_id = ed.id
                 INNER JOIN
             exam_print_plan epp ON epp.id = ed.print_plan_id
+                LEFT JOIN
+            basic_course bc ON edc.course_id = bc.id
         <where>
             <if test="schoolId != null and schoolId != ''">
                 AND ed.school_id = #{schoolId}
@@ -940,8 +943,8 @@
             <if test="examId != null and examId != ''">
                 AND epp.exam_id = #{examId}
             </if>
-            <if test="courseCode != null and courseCode != ''">
-                AND edc.course_code = #{courseCode}
+            <if test="courseId != null">
+                AND edc.course_id = #{courseId}
             </if>
             <if test="paperNumber != null and paperNumber != ''">
                 AND edc.paper_number = #{paperNumber}