机构版-2.1.0

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

@@ -297,6 +297,8 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
 
     int countByWorkIdAndSubjectAndIsMissingFalseAndTest(Long workId, Subject subject, int test);
 
+    int countByWorkIdAndSubjectAndIsMissingFalse(Long workId, Subject subject);
+
     int countByWorkIdAndSubjectAndLevelIsNullAndIsMissingFalseAndActiveTrueAndBatchNoNotNullAndTest(Long workId, Subject subject, int test);
 
     int countByWorkIdAndQuestionIdAndSubjectAndLevelIsNullAndIsMissingFalseAndTest(Long workId, Long questionId, Subject subject, int test);

stmms-ms-main/src/main/resources/application-dev.properties

@@ -4,7 +4,7 @@
 
 db.host=localhost
 db.port=3306
-db.dbName=msyj-org-2.0.0
+db.dbName=msyj-org-v2.1.0
 db.userName=root
 db.password=root
 
@@ -99,7 +99,7 @@ score.level.taskSort=paper
 #score.level.taskSort=paper
 
 #\u524D\u7AEF\u9759\u6001\u8D44\u6E90\u76EE\u5F55
-web.upload-path=D:\\company\\qmth\\bat-pro\\msyj-2021-v2.0.0\\dist\\
+web.upload-path=D:\\company\\qmth\\bat-pro\\msyj\\org\\msyj-2021-org-v2.1.0-nginx\\dist\\
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${sys.config.localhostPath},file:${web.upload-path}
 

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

@@ -288,7 +288,7 @@ public class MakrerApi {
                 long total = 0;
                 if (propDenominator == 1) {
                     // 全部考生
-                    total = paperRepo.countByWorkIdAndQuestionId(markSubject.getWorkId(), questionId);
+                    total = paperRepo.countByWorkIdAndQuestionIdAndIsMissingIsFalse(markSubject.getWorkId(), questionId);
                 } else if (propDenominator == 2) {
                     // 去除缺考考生
                     total = paperRepo.countByWorkIdAndQuestionIdAndIsMissingIsFalse(markSubject.getWorkId(), questionId);

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

@@ -152,9 +152,9 @@ public class MarkSubjectApi {
             }
         }
         //当前考区总数
-        long total = paperRepo.countByWorkIdAndQuestionId(markSubject.getWorkId(), questionId);
+        long total = paperRepo.countByWorkIdAndQuestionIdAndIsMissingIsFalse(markSubject.getWorkId(), questionId);
         //所有考区总数
-        long gtotal = paperRepo.countByWorkIdAndSubject(markSubject.getWorkId(), markSubject.getSubject());
+        long gtotal = paperRepo.countByWorkIdAndSubjectAndIsMissingFalse(markSubject.getWorkId(), markSubject.getSubject());
         levelStatDTOs.forEach(o -> {
             if (o.getId() != null) {
                 //当前考区档位占比

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

@@ -223,24 +223,26 @@ public class PaperApi {
                 predicates.add(builder.equal(root.get("questionId"), questionId));
             }
             //isScore为true时，为科组长打分详情页面数据查询条件
-            if (isScore) {
-                //level为null时，查询待评数量
-                if (Objects.isNull(level)) {
-                    predicates.add(builder.isNotNull(root.get("level")));
-                    predicates.add(builder.isNull(root.get("score")));
-                    predicates.add(builder.isNotNull(root.get("scoreBatchNo")));
+            if(isSample == null || !isSample) {
+                if (isScore) {
+                    //level为null时，查询待评数量
+                    if (StringUtils.isEmpty(level)) {
+                        predicates.add(builder.isNotNull(root.get("level")));
+                        predicates.add(builder.isNull(root.get("score")));
+                        predicates.add(builder.isNotNull(root.get("scoreBatchNo")));
+                    } else {
+                        predicates.add(builder.equal(root.get("level"), level));
+                        predicates.add(builder.isNotNull(root.get("score")));
+                    }
                 } else {
-                    predicates.add(builder.equal(root.get("level"), level));
-                    predicates.add(builder.isNotNull(root.get("score")));
-                }
-            } else {
-                if (Objects.isNull(level)) {
-                    predicates.add(builder.isNull(root.get("level")));
-                    //查询当前批次号数据
+                    if (StringUtils.isEmpty(level)) {
+                        predicates.add(builder.isNull(root.get("level")));
+                        //查询当前批次号数据
 //                predicates.add(builder.equal(root.get("batchNo"), batchNo));
-                } else {
-                    predicates.add(builder.equal(root.get("level"), level));
-                    predicates.add(builder.isNotNull(root.get("batchNo")));
+                    } else {
+                        predicates.add(builder.equal(root.get("level"), level));
+                        predicates.add(builder.isNotNull(root.get("batchNo")));
+                    }
                 }
             }
             if (arbi != null) {