3.1.1 fix

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/QualityAnalyseController.java

@@ -478,7 +478,7 @@ public class QualityAnalyseController {
         stage = Objects.isNull(stage) ? MarkStage.LEVEL : stage;
         List list = new ArrayList();
         if (MarkStage.ROUGH_LEVEL.equals(stage)) {
-            String sql = new StringBuffer("select mtsc.marker_id, mtsc.level self_level, mtsc.level_value self_level_value, mtrl.level, mtrl.level_value from (select * from mark_task_self_check where work_id = ").append(workId).append(" and subject = '").append(subject.name()).append("' and stage = '").append(stage.ordinal()).append("') mtsc join mark_task_rough_level mtrl on mtsc.task_id = mtrl.id").toString();
+            String sql = new StringBuffer("select mtsc.marker_id, mtsc.level self_level, mtsc.level_value self_level_value, mtrl.level, mtrl.level_value from (select * from mark_task_self_check where work_id = ").append(workId).append(" and subject = '").append(subject.name()).append("' and stage = '").append(stage.ordinal()).append("' and marking = 1) mtsc join mark_task_rough_level mtrl on mtsc.task_id = mtrl.id").toString();
             if (Objects.nonNull(startTime)) {
                 sql = sqlUtil.sqlConditionAnd(sql, new String[]{"mtsc.updated_on"}, new String[]{startTime}, new String[]{">="});
             }
@@ -487,7 +487,7 @@ public class QualityAnalyseController {
             }
             list = sqlUtil.execSqlForMap(sql);
         } else if (MarkStage.LEVEL.equals(stage)) {
-            String sql = new StringBuffer("select mtsc.marker_id, mtsc.level self_level, mtsc.level_value self_level_value, mtrl.level, mtrl.level_value from (select * from mark_task_self_check where work_id = ").append(workId).append(" and subject = '").append(subject.name()).append("' and stage = '").append(stage.ordinal()).append("') mtsc join mark_task_level mtrl on mtsc.task_id = mtrl.id").toString();
+            String sql = new StringBuffer("select mtsc.marker_id, mtsc.level self_level, mtsc.level_value self_level_value, mtrl.level, mtrl.level_value from (select * from mark_task_self_check where work_id = ").append(workId).append(" and subject = '").append(subject.name()).append("' and stage = '").append(stage.ordinal()).append("' and marking = 1) mtsc join mark_task_level mtrl on mtsc.task_id = mtrl.id").toString();
             list = sqlUtil.execSqlForMap(sql);
         }
         if (!CollectionUtils.isEmpty(list)) {

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/MarkTaskMarkerPaperRepo.java

@@ -20,4 +20,6 @@ public interface MarkTaskMarkerPaperRepo extends JpaRepository<MarkTaskMarkerPap
     List<MarkTaskMarkerPaper> findByWorkIdAndSubjectAndStageAndMarkerId(Long workId, Subject subject, MarkStage stage, Long markerId);
 
     int countByWorkIdAndSubjectAndStageAndMarkerId(Long workId, Subject subject, MarkStage stage, Long markerId);
+
+    void deleteByWorkIdAndSubjectAndStage(Long workId, Subject subject, MarkStage stage);
 }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/MarkTaskSelfCheckRepo.java

@@ -21,4 +21,6 @@ public interface MarkTaskSelfCheckRepo extends JpaRepository<MarkTaskSelfCheck,
     void updateMarkingById(Long id, String level, int levelValue, Boolean marking, Date date);
 
     MarkTaskSelfCheck findByWorkIdAndMarkerIdAndSubjectAndStageAndMarking(Long workId, Long markerId, Subject subject, MarkStage stage, boolean marking);
+
+    void deleteByWorkIdAndSubjectAndStage(Long workId, Subject subject, MarkStage stage);
 }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/MarkTaskSelfCheckService.java

@@ -178,4 +178,12 @@ public class MarkTaskSelfCheckService {
         markTaskMarkerPaperRepo.deleteByWorkIdAndSubjectAndStageAndMarkerId(workId, subject, stage, markerId);
         return true;
     }
+
+    @Transactional
+    public void deleteSelfData(Long workId, Subject subject, MarkStage stage) {
+        // 删除自查卷
+        markTaskSelfCheckRepo.deleteByWorkIdAndSubjectAndStage(workId, subject, stage);
+        // 删除评卷员当前评卷记录
+        markTaskMarkerPaperRepo.deleteByWorkIdAndSubjectAndStage(workId, subject, stage);
+    }
 }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/MarkingService.java

@@ -77,6 +77,9 @@ public class MarkingService {
     @Resource
     MarkerGroupStudentRepo markerGroupStudentRepo;
 
+    @Resource
+    MarkTaskSelfCheckService markTaskSelfCheckService;
+
     @Transactional
     public void subjectReset(Long workId, Subject subject, MarkStage stage) {
         // 清除mark_user分组
@@ -141,6 +144,8 @@ public class MarkingService {
         markLogRepo.deleteByWorkIdAndSubjectAndStage(workId, subject.name(), stage);
         //清除分组导入的考生名单数据
         markerGroupStudentRepo.deleteByWorkIdAndSubjectAndStage(workId, subject, stage);
+        // 清除自查卷数据
+        markTaskSelfCheckService.deleteSelfData(workId, subject, stage);
 
         // 所有用户强制退出
         List<MarkUser> userList = markUserRepo.findByWorkIdAndSubject(workId, subject);