3.0.0-bug修改

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

@@ -71,7 +71,7 @@ public interface BasicMessageService extends IService<BasicMessage> {
      * @param messageType 短信类型
      * @param sysUser
      */
-    void sendNoticeUploadStructure(String paperNumber, String courseCode, Long userId, MessageEnum messageType, SysUser sysUser);
+    void sendNoticeUploadStructure(String paperNumber, String courseCode, String courseName, Long userId, MessageEnum messageType, SysUser sysUser);
 
     /**
      * 查询

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

@@ -277,10 +277,11 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
             String mobileNumber = user.getMobileNumber();
             String paperNumber = examTask.getPaperNumber();
             String courseCode = examTask.getCourseCode();
+            String courseName = examTask.getCourseName();
 
             Map<String, Object> jsonMap = new HashMap<>();
             jsonMap.put("userName", userName);
-            StringJoiner sj = new StringJoiner("、").add(courseCode).add(paperNumber);
+            StringJoiner sj = new StringJoiner("、").add(courseName).add(paperNumber);
             jsonMap.put("courseNameAndPaperNumber", sj.toString());
             String variableParams = JSON.toJSONString(jsonMap);
             String remark = String.format("命题任务ID：%s", examTask.getId().toString());
@@ -337,9 +338,10 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
             String mobileNumber = user.getMobileNumber();
             String paperNumber = examTask.getPaperNumber();
             String courseCode = examTask.getCourseCode();
+            String courseName = examTask.getCourseName();
             Map<String, Object> jsonMap = new HashMap<>();
             jsonMap.put("userName", userName);
-            StringJoiner sj = new StringJoiner("、").add(courseCode).add(paperNumber);
+            StringJoiner sj = new StringJoiner("、").add(courseName).add(paperNumber);
             jsonMap.put("courseNameAndPaperNumber", sj.toString());
             String variableParams = JSON.toJSONString(jsonMap);
             String remark = String.format("命题任务ID：%s", examTask.getId().toString());
@@ -348,7 +350,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
     }
 
     @Override
-    public void sendNoticeUploadStructure(String paperNumber, String courseCode, Long userId, MessageEnum messageType, SysUser sysUser) {
+    public void sendNoticeUploadStructure(String paperNumber, String courseCode,String courseName, Long userId, MessageEnum messageType, SysUser sysUser) {
         QueryWrapper<BasicMessage> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicMessage::getPaperNumber, paperNumber).eq(BasicMessage::getCourseCode, courseCode).eq(BasicMessage::getUserId, userId).eq(BasicMessage::getMessageType, messageType);
         List<BasicMessage> list = this.list(queryWrapper);
@@ -362,7 +364,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
 
             Map<String, Object> jsonMap = new HashMap<>();
             jsonMap.put("userName", userName);
-            StringJoiner sj = new StringJoiner("、").add(courseCode).add(paperNumber);
+            StringJoiner sj = new StringJoiner("、").add(courseName).add(paperNumber);
             jsonMap.put("courseNameAndPaperNumber", sj.toString());
             String variableParams = JSON.toJSONString(jsonMap);
             this.saveMessageSendLog(sysUser.getSchoolId(), userId, userName, mobileNumber, paperNumber, courseCode, variableParams, messageType, sysUser.getId(), null);

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

@@ -473,7 +473,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
         List<ExamDetailCourse> examDetailCourses = examDetailService.listSyncPaperNumberByPrintPlanId(id);
         for (ExamDetailCourse examDetailCours : examDetailCourses) {
             ExamTask examTask = examTaskService.getByCourseCodeAndPaperNumber(examDetailCours.getSchoolId(), examDetailCours.getCourseCode(), examDetailCours.getPaperNumber());
-            basicMessageService.sendNoticeUploadStructure(examTask.getPaperNumber(), examTask.getCourseCode(), examTask.getUserId(), MessageEnum.NOTICE_OF_UPLOAD_STRUCTURE, sysUser);
+            basicMessageService.sendNoticeUploadStructure(examTask.getPaperNumber(), examTask.getCourseCode(), examTask.getCourseName(), examTask.getUserId(), MessageEnum.NOTICE_OF_UPLOAD_STRUCTURE, sysUser);
         }
     }