线下版本-优化参数修改-20201116

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

@@ -74,8 +74,8 @@ public class ParamApi {
             paramSetting = ParamSetting.init();
         }
 
-        List<MarkTask> markTasks = markTaskRepo.findByWorkId(workId);
-        if (!markTasks.isEmpty() && markTasks.size() > 0
+        int countMarkTasks = markTaskRepo.countByWorkId(workId);
+        if (countMarkTasks > 0
                 && !Objects.equals(packageScan, paramSetting.getPackageScan())) {
             throw new RuntimeException("该评卷工作当前不是采集阶段，不能修改是否整包扫描参数");
         }
@@ -123,9 +123,9 @@ public class ParamApi {
                                            @RequestParam Integer cumulativeError,
                                            @RequestParam Integer levelShowAllPaper) {
         List<MarkSubject> markSubjects = markSubjectRepo.findByWorkIdAndTestNotIn(workId, Arrays.asList(TrialEnum.DEFAULT.ordinal(), TrialEnum.START_FORMAL.ordinal()));
-        List<MarkTask> markTasks = markTaskRepo.findByWorkId(workId);
+        int countMarkTasks = markTaskRepo.countByWorkId(workId);
         boolean flag = false;
-        if ((markSubjects == null || markSubjects.size() == 0) && (markTasks != null && markTasks.size() > 0)) {
+        if ((markSubjects == null || markSubjects.size() == 0) && countMarkTasks > 0) {
             flag = true;
         }
 
@@ -163,9 +163,9 @@ public class ParamApi {
         Integer changeStage = (Integer) map.get("changeStage");
         Integer scoreShowAllPaper = (Integer) map.get("scoreShowAllPaper");
         List<MarkSubject> markSubjects = markSubjectRepo.findByWorkIdAndTestNotIn(workId, Arrays.asList(TrialEnum.DEFAULT.ordinal(), TrialEnum.START_FORMAL.ordinal()));
-        List<MarkTask> markTasks = markTaskRepo.findByWorkId(workId);
+        int countMarkTasks = markTaskRepo.countByWorkId(workId);
         boolean flag = false;
-        if ((markSubjects == null || markSubjects.size() == 0) && (markTasks != null && markTasks.size() > 0)) {
+        if ((markSubjects == null || markSubjects.size() == 0) && countMarkTasks > 0) {
             flag = true;
         }
 

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

@@ -223,4 +223,7 @@ public interface MarkTaskRepo extends JpaRepository<MarkTask, Long>, JpaSpecific
 
     @Query(value = "select count(1) from mark_task m where m.work_id = ?1 and m.subject = ?2 and m.marker_id = ?3 and m.stage = ?4 and m.is_rejected = 1", nativeQuery = true)
     int findByWorkIdAndSubjectAndMarkerIdAndStageReject(Long workId, String subject, Long valueOf, int stage);
+
+    @Query(value = "select count(1) from mark_task m where m.work_id = ?1", nativeQuery = true)
+    int countByWorkId(Long workId);
 }