联考版-v3.1.0-测试bug修改

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/cache/ParamCache.java

@@ -68,25 +68,30 @@ public class ParamCache {
      * @param value    参数值
      */
     public static void cacheParam(ParamSettingTypeEnum typeEnum, Long workId, String value) {
+        String workIdStr = String.valueOf(workId);
         // 采集
         if (ParamSettingTypeEnum.COLLECT.equals(typeEnum)) {
             CollectConfig collectConfig = JSON.parseObject(value, CollectConfig.class);
-            collectConfigMap.put(String.valueOf(workId), collectConfig);
+            collectConfigMap.remove(workIdStr);
+            collectConfigMap.put(workIdStr, collectConfig);
         }
         // 粗分档
         if (ParamSettingTypeEnum.ROUGH_LEVEL.equals(typeEnum)) {
             RoughLevelConfig roughLevelConfig = JSON.parseObject(value, RoughLevelConfig.class);
-            roughLevelConfigMap.put(String.valueOf(workId), roughLevelConfig);
+            roughLevelConfigMap.remove(workIdStr);
+            roughLevelConfigMap.put(workIdStr, roughLevelConfig);
         }
         // 细分档
         if (ParamSettingTypeEnum.LEVEL.equals(typeEnum)) {
             LevelConfig levelConfig = JSON.parseObject(value, LevelConfig.class);
-            levelConfigMap.put(String.valueOf(workId), levelConfig);
+            levelConfigMap.remove(workIdStr);
+            levelConfigMap.put(workIdStr, levelConfig);
         }
         // 打分
         if (ParamSettingTypeEnum.SCORE.equals(typeEnum)) {
             ScoreConfig scoreConfig = JSON.parseObject(value, ScoreConfig.class);
-            scoreConfigMap.put(String.valueOf(workId), scoreConfig);
+            scoreConfigMap.remove(workIdStr);
+            scoreConfigMap.put(workIdStr, scoreConfig);
         }
     }
 }

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

@@ -73,11 +73,11 @@ public class DetermineRoughLevelService {
                 // 取优
                 int majorityLevelValue = Integer.parseInt(levelMap.get(majorityResult.getResult()));
                 int weightLevelValue = Integer.parseInt(levelMap.get(weightResult.getResult()));
-                // 值越大，档位越大
+                // 值越小，档位越大
                 if (majorityLevelValue < weightLevelValue) {
-                    return weightResult;
-                } else {
                     return majorityResult;
+                } else {
+                    return weightResult;
                 }
             } else {
                 return majorityResult;

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

@@ -272,7 +272,7 @@ public class MarkingLevelService {
         paper.setMarkByLeader(true);
         //打回后撤销标准卷
         paper.setSample(false);
-
+        paper.setArbitrated(false);
 
         List<MarkTaskLevel> markTasks = markTaskLevelRepo.findByPaperId(paper.getId());
 

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

@@ -243,7 +243,7 @@ public class MarkingRoughLevelService {
             markTask.setRejected(false);
             markTask.setResult(level);
             markTask.setLevel(level);
-            markTask.setSample(paper.isSample());
+            markTask.setSample(paper.isRoughSample());
         }
         markTaskRoughLevelRepo.save(markTasks);
 
@@ -271,6 +271,7 @@ public class MarkingRoughLevelService {
         paper.setMarkByLeader(true);
         //打回后撤销标准卷
         paper.setRoughSample(false);
+        paper.setArbitrated(false);
         List<MarkTaskRoughLevel> markTasks = markTaskRoughLevelRepo.findByPaperId(paper.getId());
 
         List<MarkLog> markLogList = new ArrayList<>();