美术阅卷11月新增需求-修复打分阶段分档配置BUG

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

@@ -93,12 +93,12 @@ public class MarkTaskApi {
                 }
             } else if (stage == MarkStage.SCORE) {
                 //查询
-                if (Objects.nonNull(scoreConfig) && scoreConfig.isEnable()) {
-                    Long batchNo = markTaskRepo.findByQuestionId(questionId);
-                    if (!Objects.isNull(batchNo)) {
-                        predicates.add(builder.equal(root.get("batchNo"), batchNo));
-                    }
-                }
+//                if (Objects.nonNull(scoreConfig) && scoreConfig.isEnable()) {
+//                    Long batchNo = markTaskRepo.findByQuestionId(questionId);
+//                    if (!Objects.isNull(batchNo)) {
+//                        predicates.add(builder.equal(root.get("batchNo"), batchNo));
+//                    }
+//                }
                 predicates.add(builder.isNotNull(root.get("result")));
             }
             if (isSample != null) {

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

@@ -212,9 +212,9 @@ public class StageControlService {
                 Collections.sort(levelList);
                 Object o1 = levelList.stream().map(s -> "'" + s + "'").collect(Collectors.joining(","));
                 StringJoiner joiner = new StringJoiner("");
-                joiner.add("select count(1),p.`level` from mark_task mt left join paper p on p.id = mt.paper_id where mt.stage = 2 and p.`level` in (").add(o1.toString()).add(") and mt.work_id = ? ");
+                joiner.add("select count(1),p.`level` from mark_task mt left join paper p on p.id = mt.paper_id where mt.stage = 2 and p.`level` in (").add(o1.toString()).add(") and mt.work_id = ").add(String.valueOf(workId)).add(" and mt.subject = '").add(String.valueOf(subject)).add("'");
                 String sql = sqlUtil.sqlGroupBy(joiner.toString(), "p.`level`");
-                List list = sqlUtil.execSqlForMap(sql, workId);
+                List list = sqlUtil.execSqlForMap(sql);
                 List<String> finalLevelList = new ArrayList();
                 if (Objects.isNull(list) || list.size() == 0) {
                     finalLevelList.addAll(levelList);
@@ -240,9 +240,9 @@ public class StageControlService {
                     Collections.sort(levelList);
                     Object o1 = levelList.stream().map(s -> "'" + s + "'").collect(Collectors.joining(","));
                     StringJoiner joiner = new StringJoiner("");
-                    joiner.add("select count(1),p.`level` from mark_task mt left join paper p on p.id = mt.paper_id where mt.stage = 2 and p.`level` in (").add(o1.toString()).add(") and mt.work_id = ? ");
+                    joiner.add("select count(1),p.`level` from mark_task mt left join paper p on p.id = mt.paper_id where mt.stage = 2 and p.`level` in (").add(o1.toString()).add(") and mt.work_id = ").add(String.valueOf(workId)).add(" and mt.subject = '").add(String.valueOf(subject)).add("'");
                     String sql = sqlUtil.sqlGroupBy(joiner.toString(), "p.`level`");
-                    List list = sqlUtil.execSqlForMap(sql, workId);
+                    List list = sqlUtil.execSqlForMap(sql);
                     List<String> finalLevelList = new ArrayList();
                     for (int i = 0; i < list.size(); i++) {
                         Map map = (Map) list.get(i);
@@ -253,8 +253,8 @@ public class StageControlService {
                     if (finalLevelList.size() > 0) {
                         joiner = new StringJoiner("");
                         Object o2 = finalLevelList.stream().map(s -> "'" + s + "'").collect(Collectors.joining(","));
-                        joiner.add("select count(1) as count from mark_task mt left join paper p on p.id = mt.paper_id where mt.stage = 2 and p.`level` in (").add(o2.toString()).add(")").add(" and mt.`result` is null and mt.work_id = ? ");
-                        list = sqlUtil.execSqlForMap(joiner.toString(), workId);
+                        joiner.add("select count(1) as count from mark_task mt left join paper p on p.id = mt.paper_id where mt.stage = 2 and p.`level` in (").add(o2.toString()).add(")").add(" and mt.`result` is null").add(" and mt.work_id = ").add(String.valueOf(workId)).add(" and mt.subject = '").add(String.valueOf(subject)).add("'");
+                        list = sqlUtil.execSqlForMap(joiner.toString());
                         if (Objects.nonNull(list) && list.size() > 0) {
                             Map map = (Map) list.get(0);
                             int taskCount = Integer.parseInt(String.valueOf(map.get("count")));