3.2.5 bug修改

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

@@ -35,7 +35,7 @@ public interface ExamCardMapper extends BaseMapper<ExamCard> {
 
     List<SyncExamCardDto> listSyncCardByCourseCodeAndPaperNumber(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber);
 
-    IPage<ExamCardPageDto> listPage(@Param("page") Page<ExamCardPageDto> page, @Param("schoolId") Long schoolId, @Param("type") String type, @Param("title") String title, @Param("createMethod") String createMethod, @Param("enable") Boolean enable, @Param("createStartTime") Long createStartTime, @Param("createEndTime") Long createEndTime, @Param("dpr") DataPermissionRule dpr);
+    IPage<ExamCardPageDto> listPage(@Param("page") Page<ExamCardPageDto> page, @Param("schoolId") Long schoolId, @Param("cardType") String cardType, @Param("title") String title, @Param("createMethod") String createMethod, @Param("enable") Boolean enable, @Param("createStartTime") Long createStartTime, @Param("createEndTime") Long createEndTime, @Param("dpr") DataPermissionRule dpr);
 
     List<ExamCard> listCustomByExamStage(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("type") String type);
 }

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

@@ -40,7 +40,7 @@ public interface ExamCardService extends IService<ExamCard> {
 
     List<SyncExamCardDto> listSyncCardByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber);
 
-    IPage<ExamCardPageDto> listPage(String type, String title, String createMethod, Boolean enable, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamCardPageDto> listPage(String cardType, String title, String createMethod, Boolean enable, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize);
 
     Long saveGeneric(GenericExamCardParams params) throws Exception;
 

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

@@ -343,11 +343,11 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
 
 
     @Override
-    public IPage<ExamCardPageDto> listPage(String type, String title, String createMethod, Boolean enable, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamCardPageDto> listPage(String cardType, String title, String createMethod, Boolean enable, Long createStartTime, Long createEndTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
-        IPage<ExamCardPageDto> cardPageDtoIPage = this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, type, title, createMethod, enable, createStartTime, createEndTime, dpr);
+        IPage<ExamCardPageDto> cardPageDtoIPage = this.baseMapper.listPage(new Page<>(pageNumber, pageSize), schoolId, cardType, title, createMethod, enable, createStartTime, createEndTime, dpr);
         for (ExamCardPageDto record : cardPageDtoIPage.getRecords()) {
             if (StringUtils.isNotBlank(record.getJpgAttachmentInfo())) {
                 List<JSONObject> mapList = JSON.parseArray(record.getJpgAttachmentInfo(), JSONObject.class);

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

@@ -356,9 +356,12 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
                 }
             }
 
+
             // 班级
-            String className = examDetailService.findClazzNamesByClazzIds(record.getClassId(), ",");
-            record.setClassName(className);
+            if(StringUtils.isNotBlank(record.getClassName())) {
+                String className = examDetailService.findClazzNamesByClazzIds(record.getClassId(), ",");
+                record.setClassName(className);
+            }
         }
         return clientPrintTaskDtoIPage;
     }

distributed-print-business/src/main/resources/db/log/脚本-xiaof.sql

@@ -71,3 +71,7 @@ ALTER TABLE `exam_paper_structure`
 
 ALTER TABLE `exam_paper_structure`
     CHANGE COLUMN `paper_number` `paper_number` VARCHAR(50) CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_general_ci' NOT NULL COMMENT '试卷编号' ;
+
+
+ALTER TABLE `exam_task_sync`
+    CHANGE COLUMN `paper_type` `paper_type` VARCHAR(50) CHARACTER SET 'utf8mb4' NULL DEFAULT NULL COMMENT '试卷类型' ;

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

@@ -205,8 +205,8 @@
             from exam_card ec left join exam_card_detail ecd on ec.id = ecd.card_id
         <where>
             ec.school_id = #{schoolId}
-            <if test="type != null and type != ''">
-                and ec.type = #{type}
+            <if test="cardType != null and cardType != ''">
+                and ec.type = #{cardType}
             </if>
             <if test="title != null and title != ''">
                 and ec.title like concat('%', #{title}, '%')

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

@@ -238,6 +238,7 @@
                 ) ets ON et.school_id = ets.school_id
                 AND et.exam_id = ets.exam_id
                 AND et.paper_number = ets.paper_number
+                AND t.paper_type = ets.paper_type
                 LEFT JOIN
             sys_user su ON ets.sync_user_id = su.id
                 LEFT JOIN

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

@@ -162,6 +162,7 @@
             c.courseNameCode,
             c.paperNumber,
             c.classId,
+            c.className,
             b.exam_place examPlace,
             b.exam_room examRoom,
             b.total_subjects totalSubjects,
@@ -204,6 +205,7 @@
                     GROUP_CONCAT(CONCAT(a.course_name, '(', a.course_code, ')')) courseNameCode,
                     GROUP_CONCAT(a.paper_number) paperNumber,
                     GROUP_CONCAT(a.clazz_id) classId,
+                    GROUP_CONCAT(a.clazz_name) className,
                     GROUP_CONCAT(IFNULL(a.paper_pages_a3, 0) + IFNULL(a.card_pages_a3, 0)) singlePagesA3,
                     SUM(CASE b.is_download
                         WHEN true THEN 0

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamCardController.java

@@ -67,7 +67,7 @@ public class ExamCardController {
      */
     @ApiOperation(value = "分页查询")
     @RequestMapping(value = "/page", method = RequestMethod.POST)
-    public Result page(@RequestParam(value = "type", required = false) String type,
+    public Result page(@RequestParam(value = "cardType", required = false) String cardType,
                        @RequestParam(value = "title", required = false) String title,
                        @RequestParam(value = "createMethod", required = false) String createMethod,
                        @RequestParam(value = "enable", required = false) Boolean enable,
@@ -75,7 +75,7 @@ public class ExamCardController {
                        @RequestParam(value = "createEndTime", required = false) Long createEndTime,
                        @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                        @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        IPage<ExamCardPageDto> examCardIPage = examCardService.listPage(type, title, createMethod, enable, createStartTime, createEndTime, pageNumber, pageSize);
+        IPage<ExamCardPageDto> examCardIPage = examCardService.listPage(cardType, title, createMethod, enable, createStartTime, createEndTime, pageNumber, pageSize);
         return ResultUtil.ok(examCardIPage);
     }