增加技能分计算及技能不锁文化分

ie-admin/src/main/java/com/ruoyi/web/controller/ie/VoluntaryController.java

@@ -85,6 +85,24 @@ public class VoluntaryController extends BaseController {
         return voluntaryService.postRenderResult(req, false);
     }
 
+    @PostMapping("/voluntary/postSkillRules")
+    @ApiOperation("单院校专业结果")
+    public R<VoluntaryDto.RenderMajorResult> postSkillRules(@RequestBody String data) {
+        // commService.requireVip();
+        VoluntaryDto.SingleRequest req = new VoluntaryDto.SingleRequest();
+        JSONObject root = JSONObject.parseObject(data);
+        Map<String, String> form = req.getForm();
+        for(String key : root.keySet()) {
+            JSONObject sub = root.getJSONObject(key);
+            for (String field : sub.keySet()) {
+                form.put(field, sub.getString(field));
+            }
+        }
+        req.setUniversityCode(form.remove("universityId"));
+        req.setMajorEnrollCode(form.remove("majorId"));
+        return voluntaryService.postRenderResult(req, true);
+    }
+
     @GetMapping("voluntary/getVoluntaryList")
     @ApiOperation("查询志愿列表")
     public R<List<VoluntaryDto.VoluntaryRecord>> voluntaryList() { // 我的志愿表 // 后台填充快照缺省

ie-admin/src/main/java/com/ruoyi/web/domain/VoluntaryDto.java

@@ -605,9 +605,8 @@ public class VoluntaryDto {
         }
 
         public Double getImproveSkillScore(Double diffValue) {
-            MutablePair<Double, Double> scorePair = groupTypeStatMap.get("技能测试");
-            Double missRateScore = diffValue * scorePair.getRight() / groupAllTotal;
-            return missRateScore;
+            // TODO 暂不支持有系数的规则, 如果技能分有两个的还不好计算原始分？
+            return diffValue;
         }
 
         // 原始分, 总分, 得分率

ie-admin/src/main/java/com/ruoyi/web/service/VoluntaryService.java

@@ -549,7 +549,7 @@ public class VoluntaryService {
             }
             VoluntaryDto.AIRenderRule r = new VoluntaryDto.AIRenderRule();
             r.setEnumRuleCategory(VoluntaryDto.EnumRuleCategory.Enroll);
-            if (isOHS && "Score".equals(s.getValueType()) && !isSkill) {
+            if (!isSkill && isOHS && !isScore && "Score".equals(s.getValueType())) {
                 r.setReadonly(true);
                 Double score = subjectScore.getSelectScore(s.getItemField());
                 if (null == score && SubjectType.Foreign.name().equals(s.getItemField())) {