Merge remote-tracking branch 'origin/dev_v3.2.6' into dev_v3.2.6

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

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

@@ -18,6 +18,10 @@ public class ExamDetailCourseDto extends ExamDetailCourse {
 
     private String sequence;
 
+    private String loginName;
+
+    private String realName;
+
     public Long getExamTaskId() {
         return examTaskId;
     }
@@ -49,4 +53,20 @@ public class ExamDetailCourseDto extends ExamDetailCourse {
     public void setSequence(String sequence) {
         this.sequence = sequence;
     }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
 }

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

@@ -3,10 +3,7 @@ package com.qmth.distributed.print.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.bean.dto.ClientExamStudentDto;
-import com.qmth.distributed.print.business.bean.dto.ExamDetailPdfDownloadDto;
-import com.qmth.distributed.print.business.bean.dto.PrintTaskDto;
-import com.qmth.distributed.print.business.bean.dto.PrintTaskTotalDto;
+import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.result.ExaminationDetailResult;
 import com.qmth.distributed.print.business.bean.result.ExaminationResult;
 import com.qmth.distributed.print.business.bean.result.SummarizedDataResult;
@@ -121,5 +118,5 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
 
     SummarizedDataResult findSummarizedData(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("printPlanIdList") List<Long> printPlanIdList, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("examPlace") String examPlace, @Param("examRoom") String examRoom, @Param("packageCode") String packageCode, @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("dpr") DataPermissionRule dpr);
 
-    List<ExamDetailCourse> listByExamIdAndCourseCode(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+    List<ExamDetailCourseDto> listByExamIdAndCourseCode(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 }

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

@@ -248,7 +248,7 @@ public interface ExamDetailService extends IService<ExamDetail> {
 
     List<ExamStudent> listStudentByExamDetailId(String examDetailId);
 
-    List<ExamDetailCourse> listByExamIdAndCourseCode(Long schoolId, Long examId, String courseCode);
+    List<ExamDetailCourseDto> listByExamIdAndCourseCode(Long schoolId, Long examId, String courseCode);
 
     void deleteByExamIdAndPaperNumber(Long schoolId, Long examId, String paperNumber);
 }

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

@@ -1137,7 +1137,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     }
 
     @Override
-    public List<ExamDetailCourse> listByExamIdAndCourseCode(Long schoolId, Long examId, String courseCode) {
+    public List<ExamDetailCourseDto> listByExamIdAndCourseCode(Long schoolId, Long examId, String courseCode) {
         return this.baseMapper.listByExamIdAndCourseCode(schoolId, examId, courseCode);
     }
 

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

@@ -665,13 +665,17 @@
         </trim>
     </select>
     <select id="listByExamIdAndCourseCode"
-            resultMap="com.qmth.distributed.print.business.mapper.ExamDetailCourseMapper.BaseResultMap">
+            resultType="com.qmth.distributed.print.business.bean.dto.ExamDetailCourseDto">
         SELECT
-            *
+            edc.clazz_id clazzId,
+            su.login_name loginName,
+            su.real_name realName
         FROM
             exam_detail_course edc
                 JOIN
             exam_detail ed ON edc.exam_detail_id = ed.id
+                left join
+            sys_user su ON ed.create_id = su.id
         WHERE
             edc.school_id = #{schoolId} AND ed.exam_id = #{examId}
           AND edc.course_code = #{courseCode} AND ed.status != 'CANCEL'