3.3.3 update

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

@@ -40,17 +40,13 @@ public class BasicPrintConfigServiceImpl extends ServiceImpl<BasicPrintConfigMap
 
     @Resource
     private BasicExamService basicExamService;
-    @Resource
-    private BasicRoleDataPermissionService basicRoleDataPermissionService;
 
     @Override
     public IPage<BasicPrintConfig> listPage(Long examId, 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());
 
         Page<BasicPrintConfig> page = new Page<>(pageNumber, pageSize);
-        return this.baseMapper.listPage(page, schoolId, examId, enable, createStartTime, createEndTime, dpr);
+        return this.baseMapper.listPage(page, schoolId, examId, enable, createStartTime, createEndTime, null);
     }
 
     @Override

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

@@ -1471,8 +1471,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     examDetailCourse.setPaperNumber(paperNumber);
                     examDetailCourse.setClazzId(examDetailParams.getClassId());
                     if (StringUtils.isNotBlank(examDetailParams.getClassId())) {
-                        List<BasicClazz> basicClazzList = basicClazzService.listByIds(Arrays.asList(examDetailParams.getClassId().split(",")));
-                        examDetailCourse.setClazzName(basicClazzList.stream().map(BasicClazz::getClazzName).collect(Collectors.joining(",")));
+                        List<BasicTeachClazz> basicClazzList = basicTeachClazzService.listByIds(Arrays.asList(examDetailParams.getClassId().split(",")));
+                        examDetailCourse.setClazzName(basicClazzList.stream().map(BasicTeachClazz::getClazzName).collect(Collectors.joining(",")));
                     }
                     examDetailCourse.setTotalSubjects(examDetailParams.getTotalSubjects());
                     examDetailCourse.setCreateId(sysUser.getId());

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

@@ -96,8 +96,7 @@
                     </if>
                 </where>
                 ) t
-                WHERE
-                FIND_IN_SET(id, t.cardId))
+                WHERE LOCATE(id,t.cardId) > 0)
             </if>
             <if test="cardType != null and cardType != ''">
                 and type = #{cardType}

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

@@ -1262,8 +1262,8 @@
             b.backup_count,
             b.status,
             b.print_house_id,
-            b.exam_place campusName,
-            b.clazz_name className
+            ifnull(b.exam_place, a.exam_place) campusName,
+            ifnull(b.clazz_name, a.clazz_name) className
         FROM
         (SELECT
             et.exam_id,
@@ -1273,12 +1273,27 @@
             su.login_name,
             su.real_name,
             etd.unexposed_paper_type,
-            etd.exposed_paper_type
+            etd.exposed_paper_type,
+            c.exam_place,
+            c.clazz_name
         FROM
             exam_task et
         LEFT JOIN exam_task_detail etd ON et.id = etd.exam_task_id
         LEFT JOIN basic_exam be ON et.exam_id = be.id
         LEFT JOIN sys_user su ON et.user_id = su.id
+        LEFT JOIN (select ed.exam_id , edc.paper_number,
+                          group_concat(distinct ed.exam_place) exam_place,
+                          group_concat(distinct edc.clazz_name) clazz_name
+                          from exam_detail ed left join exam_detail_course edc on ed.id = edc.exam_detail_id
+                where ed.exam_id = #{examId}
+                <if test="courseCode != null and courseCode != ''">
+                    AND edc.course_code = #{courseCode}
+                </if>
+                <if test="paperNumber != null and paperNumber != ''">
+                    AND edc.paper_number = #{paperNumber}
+                </if>
+                group by ed.exam_id , edc.paper_number
+                ) c on et.exam_id = c.exam_id and et.paper_number = c.paper_number
         WHERE
         be.semester_id = #{semesterId}
         AND et.exam_id = #{examId}