3.2.0-bug

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

@@ -154,9 +154,9 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             if (CardTypeEnum.CUSTOM.equals(examCard.getType()) && !examCardParams.getCourseCode().equals(examCard.getCourseCode())) {
                 throw ExceptionResultEnum.ERROR.exception("课程不能更改");
             }
-            if (!examCardParams.getMakeMethod().name().equals(examCard.getMakeMethod().name())) {
-                throw ExceptionResultEnum.ERROR.exception("题卡制作方式不能更改");
-            }
+//            if (!examCardParams.getMakeMethod().name().equals(examCard.getMakeMethod().name())) {
+//                throw ExceptionResultEnum.ERROR.exception("题卡制作方式不能更改");
+//            }
             examCard.setStatus(examCardParams.getStatus());
             examCard.setUpdateId(user.getId());
             examCard.setUpdateTime(System.currentTimeMillis());
@@ -179,7 +179,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         }
 
         // 绑定命题任务
-        examTaskDetailService.bindCardId(examCardParams.getExamTaskId(), examCard);
+//        examTaskDetailService.bindCardId(examCardParams.getExamTaskId(), examCard);
 
         return String.valueOf(examCard.getId());
     }
@@ -505,15 +505,15 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
      * @param examCard 题卡对象
      */
     private String checkTitle(ExamCard examCard, String courseCode) {
-        QueryWrapper<ExamCard> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ExamCard::getSchoolId, examCard.getSchoolId())
-                .eq(ExamCard::getCourseCode, courseCode);
         String title;
         int i = 1;
         ExamCard newExamCard;
         do {
             title = examCard.getTitle() + "副本" + i;
-            queryWrapper.lambda().eq(ExamCard::getTitle, title);
+            QueryWrapper<ExamCard> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(ExamCard::getSchoolId, examCard.getSchoolId())
+                    .eq(ExamCard::getCourseCode, courseCode)
+                    .eq(ExamCard::getTitle, title);
             newExamCard = this.getOne(queryWrapper);
             i++;
         } while (newExamCard != null);

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

@@ -294,7 +294,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                     JSONArray jsonArrayPaper = JSONArray.parseArray(e.getPaperAttachmentIds());
                     for (int i = 0; i < jsonArrayPaper.size(); i++) {
                         JSONObject object = jsonArrayPaper.getJSONObject(i);
-                        object.put("cardId", examCard.getId());
+                        object.put("cardId", String.valueOf(examCard.getId()));
                     }
                     e.setPaperAttachmentIds(jsonArrayPaper.toJSONString());
                 }