From cf9ca0f265d9423c15c9d042cadf86e8b8051813 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Sun, 10 Mar 2024 18:09:56 +0800
Subject: [PATCH] updates

---
 .../mini/service/MiniTestCulturalService.java | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java
index 0060cd7..59d0563 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniTestCulturalService.java
@@ -168,30 +168,28 @@ public class MiniTestCulturalService {
             }else if(YxConstant.betaMajorTypeList.contains(professionalCategory)){
                 for (ArtTestCulturalDTO artTestCulturalDTO : artTestCulturalDtoList) {
                     probabilityOperator = artTestCulturalDTO.getProbabilityOperator();
-                    if (YxConstant.betaMajorTypeList.contains(professionalCategory) && StringUtils.isNotBlank(artTestCulturalDto.getRulesEnrollProbability())) {
-                        String[] split = probabilityOperator.split("\\+");
-                        BigDecimal culturalProbabilityOperator = null;
-                        BigDecimal professionalProbabilityOperator = null;
-                        //先取出文化分和专业分的计算方式
-                        for (String s : split) {
-                            if (s.contains("专")) {
-                                professionalProbabilityOperator = new BigDecimal( s.split("\\*")[1]);
-                            }else{
-                                culturalProbabilityOperator  = new BigDecimal(s.split("\\*")[1]);
-                            }
-                        }
-                        //如果计算方式为空就不算了
-                        if (culturalProbabilityOperator!=null && professionalProbabilityOperator !=null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0 && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) {
-                            //当前输入分数乘以专业折合分
-                            BigDecimal professionalConverted = professionalScore.multiply(professionalProbabilityOperator);
-                            //余数，院校分数-专业折合分
-                            BigDecimal remainder = artTestCulturalDto.getScore().subtract(professionalConverted);
-                            //余数/文化课计算方式
-                            BigDecimal divide = remainder.divide(culturalProbabilityOperator, 0, RoundingMode.HALF_UP);
-                            //需要超越多少分
-                            artTestCulturalDto.setNeedScore(divide);
+                    String[] split = probabilityOperator.split("\\+");
+                    BigDecimal culturalProbabilityOperator = null;
+                    BigDecimal professionalProbabilityOperator = null;
+                    //先取出文化分和专业分的计算方式
+                    for (String s : split) {
+                        if (s.contains("专")) {
+                            professionalProbabilityOperator = new BigDecimal( s.split("\\*")[1]);
+                        }else{
+                            culturalProbabilityOperator  = new BigDecimal(s.split("\\*")[1]);
                         }
                     }
+                    //如果计算方式为空就不算了
+                    if (culturalProbabilityOperator!=null && professionalProbabilityOperator !=null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0 && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) {
+                        //当前输入分数乘以专业折合分
+                        BigDecimal professionalConverted = professionalScore.multiply(professionalProbabilityOperator);
+                        //余数，院校分数-专业折合分
+                        BigDecimal remainder = artTestCulturalDto.getScore().subtract(professionalConverted);
+                        //余数/文化课计算方式
+                        BigDecimal divide = remainder.divide(culturalProbabilityOperator, 0, RoundingMode.HALF_UP);
+                        //需要超越多少分
+                        artTestCulturalDTO.setNeedScore(divide);
+                    }
                 }
             }
         }