3.4.0 bug修复

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

@@ -11,6 +11,7 @@ public class ClientExamTaskDto {
     private String printPlanId;
     private String printPlanName;
     private String paperNumber;
+    private String courseId;
     private String courseCode;
     private String courseName;
     private String paperType;
@@ -70,6 +71,14 @@ public class ClientExamTaskDto {
         this.paperNumber = paperNumber;
     }
 
+    public String getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(String courseId) {
+        this.courseId = courseId;
+    }
+
     public String getCourseCode() {
         return courseCode;
     }

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

@@ -96,6 +96,7 @@ public class ClientServiceImpl implements ClientService {
             BasicCourse basicCourse = basicCourseService.getById(examTask.getCourseId());
             Map<String, Object> map = new HashMap<>();
             map.put("printPlanId", printPlanId);
+            map.put("courseId", basicCourse.getId());
             map.put("courseCode", basicCourse.getCode());
             map.put("courseName", basicCourse.getName());
             map.put("paperNumber", examTask.getPaperNumber());
@@ -523,7 +524,7 @@ public class ClientServiceImpl implements ClientService {
         List<ExamDetailCourse> examDetailCourses = examDetailCourseService.list(examDetailCourseQueryWrapper);
         for (ExamDetailCourse examDetailCours : examDetailCourses) {
             QueryWrapper<ClientStatus> clientStatusQueryWrapper = new QueryWrapper<>();
-            clientStatusQueryWrapper.lambda().eq(ClientStatus::getSchoolId, schoolId).eq(ClientStatus::getExamDetailId, examDetailId).eq(ClientStatus::getPrintPlanId, examDetail.getPrintPlanId()).eq(ClientStatus::getCourseCode, examDetailCours.getCourseCode()).eq(ClientStatus::getPaperNumber, examDetailCours.getPaperNumber()).eq(ClientStatus::getMachineCode, machineCode);
+            clientStatusQueryWrapper.lambda().eq(ClientStatus::getSchoolId, schoolId).eq(ClientStatus::getExamDetailId, examDetailId).eq(ClientStatus::getPrintPlanId, examDetail.getPrintPlanId()).eq(ClientStatus::getCourseId, examDetailCours.getCourseId()).eq(ClientStatus::getPaperNumber, examDetailCours.getPaperNumber()).eq(ClientStatus::getMachineCode, machineCode);
             ClientStatus clientStatus = clientStatusService.getOne(clientStatusQueryWrapper);
             if (clientStatus == null) {
                 clientStatus = new ClientStatus();

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

@@ -7,6 +7,7 @@
             a.exam_id examId,
             a.id printPlanId,
             a.name printPlanName,
+            c.course_id courseId,
             bc.code courseCode,
             bc.name courseName,
             c.paper_number paperNumber,
@@ -411,8 +412,9 @@
             be.name,
             epp.id,
             epp.name,
-            c.course_code,
-            c.course_name,
+            c.course_id,
+            bc.code,
+            bc.name,
             c.paper_number
     </select>
 </mapper>