Переглянути джерело

任务投放待投数据查询bug修复

xiaof 5 роки тому
батько
коміт
36769db111

+ 1 - 1
stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/PaperRepo.java

@@ -230,7 +230,7 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
 
     void deleteByWorkIdAndSubjectAndTest(Long workId, Subject subject, int test);
 
-    int countByWorkIdAndSubjectAndIsMissingFalse(Long workId, Subject subject);
+    int countByWorkIdAndSubjectAndIsMissingFalseAndTest(Long workId, Subject subject, int test);
 
     int countByWorkIdAndSubjectAndLevelIsNullAndIsMissingFalseAndActiveTrueAndBatchNoNotNullAndTest(Long workId, Subject subject, int test);
 

+ 1 - 1
stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/StageControlService.java

@@ -262,7 +262,7 @@ public class StageControlService {
         //已评任务数
         int successCount = paperRepo.countByWorkIdAndSubjectAndLevelNotNullAndIsMissingFalseAndActiveTrueAndTest(workId, subject, 0);
         //所有任务数(查询所有有效试卷)
-        int totalCount = paperRepo.countByWorkIdAndSubjectAndIsMissingFalse(workId, subject);
+        int totalCount = paperRepo.countByWorkIdAndSubjectAndIsMissingFalseAndTest(workId, subject, 0);
 
         BigDecimal waitTotal = BigDecimal.valueOf(totalCount).subtract(BigDecimal.valueOf(successCount));
         //进度