机构版-3.0.0-bug修复

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

@@ -418,4 +418,8 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
     @Modifying
     @Query("update Paper s set s.isMark = false")
     void updateIsMarkFalse();
+
+    long countByWorkIdAndSubjectAndLevelAndBatchNoNotNull(Long workId, Subject subject, String valueOf);
+
+    long countByQuestionIdAndLevelAndSubjectAndWorkIdAndBatchNoNotNull(Long questionId, String valueOf, Subject subject, Long workId);
 }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/MakrerApi.java

@@ -352,7 +352,7 @@ public class MakrerApi {
                 }
                 o.setCount(countNew);
                 //该档位考区内已定档数量
-                long gcountNew = paperRepo.countByQuestionIdAndLevelAndSubjectAndWorkId(questionId, String.valueOf(o.getId()), markSubject.getSubject(), marker.getWorkId());
+                long gcountNew = paperRepo.countByQuestionIdAndLevelAndSubjectAndWorkIdAndBatchNoNotNull(questionId, String.valueOf(o.getId()), markSubject.getSubject(), marker.getWorkId());
                 o.setGcount((int) gcountNew);
 
                 o.setPt(levelMap.get(o.getId()).getPt());

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/MarkSubjectApi.java

@@ -165,7 +165,7 @@ public class MarkSubjectApi {
                 Level level = levels.stream().filter(l -> l.getCode().equals(o.getId())).collect(Collectors.toList()).get(0);
                 o.setKdpt(level.getKdpt());
                 //所有考区档位数量
-                long gcount = paperRepo.countByWorkIdAndSubjectAndLevel(markSubject.getWorkId(), markSubject.getSubject(), String.valueOf(o.getId()));
+                long gcount = paperRepo.countByWorkIdAndSubjectAndLevelAndBatchNoNotNull(markSubject.getWorkId(), markSubject.getSubject(), String.valueOf(o.getId()));
                 o.setGcount((int) gcount);
                 //所有考区档位占比
                 double gp = gtotal == 0 ? 0 : (double) o.getGcount() / gtotal * 100;

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/PaperApi.java

@@ -226,7 +226,7 @@ public class PaperApi {
                             @RequestParam(defaultValue = "false") Boolean isScore,//打分阶段该档位已打分数
                             Pageable pageable) {
         //查询最大批次号
-//        Long batchNo = paperRepo.findByQuestionId(questionId);
+        Long batchNo = paperRepo.findByQuestionId(questionId);
         Specification<Paper> specification = (root, query, builder) -> {
             List<Predicate> predicates = new ArrayList<>();
             if (Objects.nonNull(questionId)) {
@@ -261,10 +261,10 @@ public class PaperApi {
                     if (StringUtils.isEmpty(level)) {
                         predicates.add(builder.isNull(root.get("level")));
                         //查询当前批次号数据
-//                predicates.add(builder.equal(root.get("batchNo"), batchNo));
+//                        predicates.add(builder.equal(root.get("batchNo"), batchNo));
                     } else {
                         predicates.add(builder.equal(root.get("level"), level));
-//                        predicates.add(builder.isNotNull(root.get("batchNo")));
+                        predicates.add(builder.isNotNull(root.get("batchNo")));
                     }
                 }
             }