From f357c3ee84d7d68f997a333be6cfd417d79da64a Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 20 Mar 2024 14:18:50 +0800
Subject: [PATCH] updates

---
 .../yx/controller/YxHistoryMajorEnrollController.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
index 28281da..abdda12 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
@@ -129,7 +129,7 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
         AssertUtils.notEmpty(majorCode, "请输入[专业代码]!");
         AssertUtils.notEmpty(majorName, "请输入[专业名称]!");
         AssertUtils.notNull(yxHistoryMajorEnroll.getYear(), "请输入[年份]!");
-        AssertUtils.notTrue(yxHistoryMajorEnrollService.exist(yxHistoryMajorEnroll), String.format("专业-[%s]-已经录入", majorCode));
+        //AssertUtils.notTrue(yxHistoryMajorEnrollService.exist(yxHistoryMajorEnroll), String.format("专业-[%s]-已经录入", majorCode));
         yxHistoryMajorEnrollService.updateById(yxHistoryMajorEnroll);
         return Result.OK("编辑成功!");
     }
@@ -336,18 +336,21 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
                     if ("文过专排".equals(rulesEnrollProbability)) {
                         BigDecimal multiply = specialScore.multiply(zhuanyeBili);
                         yxHistoryMajorEnroll.setControlLine(multiply);
+                        yxHistoryMajorEnroll.setRulesEnrollProbability("文过专排");
                     } else if ("专过文排".equals(rulesEnrollProbability)) {
                         BigDecimal multiply = specialScore.multiply(wenhuaBili);
                         yxHistoryMajorEnroll.setControlLine(multiply);
+                        yxHistoryMajorEnroll.setRulesEnrollProbability("专过文排");
                     } else if ("其他计算办法".equals(rulesEnrollProbability)) {
+                        yxHistoryMajorEnroll.setRulesEnrollProbability("其他计算办法");
                     } else {
                         if (wenhuaBili == null || zhuanyeBili == null) {
                             wenhuaBili = YxConstant.bigDecimal100;
                             zhuanyeBili = YxConstant.bigDecimal100;
                         }
                         yxHistoryMajorEnroll.setControlLine((culturalScore.multiply(wenhuaBili)).add((specialScore.multiply(zhuanyeBili))));
+                        yxHistoryMajorEnroll.setRulesEnrollProbability(probabilityOperator);
                     }
-                    yxHistoryMajorEnroll.setRulesEnrollProbability(probabilityOperator);
 
                     //查询库中是否有该条数据
                     yxHistoryMajorEnrollLambdaQueryWrapper.clear();