feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum32.java

@@ -1,12 +1,9 @@
 package com.rongwei.bscommon.sys.strategy.scoreCalculation;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.rongwei.bscommon.sys.service.JtFjglxmService;
 import com.rongwei.bscommon.sys.service.JtJscgpyqdService;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
-import com.rongwei.rwcommon.base.BaseDo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,8 +12,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.*;
-
 
 /**
  * ScoreCalculationServiceNum1 class
@@ -48,13 +43,16 @@ public class ScoreCalculationServiceNum32 implements ScoreCalculationService {
         String errorMsg = "";
         List<JtJscgpyqd> list = jtJscgpyqdService.list(new LambdaQueryWrapper<JtJscgpyqd>().eq(JtJscgpyqd::getDeleted, "0").eq(JtJscgpyqd::getMainid, jtGsjtbsj.getId()));
         Set<String> collect = list.stream().map(JtJscgpyqd::getPyfl).collect(Collectors.toSet());
-        if(collect.size()>= 3){
+        if (collect.size() >= 3) {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
-        }else {
+        } else {
             int i = 3 - collect.size();
             finalScore = finalScore.subtract(new BigDecimal(i));
             errorMsg = errorMsg + "公司级：识别填报的评优分类，大于等于3类，不扣分，少一类扣1分。";
         }
+        if (finalScore.compareTo(BigDecimal.ZERO) < 0) {
+            finalScore = BigDecimal.ZERO;
+        }
         return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
     }