绩效汇总扣分项避免扣为负数

attendance-performance-manager/src/main/java/com/mortals/xhx/common/utils/StaffPerformUtil.java

@@ -23,6 +23,9 @@ public class StaffPerformUtil {
             reviewScore = BigDecimal.ZERO;
         }
         BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
+        if(attendScore.compareTo(BigDecimal.ZERO)< 0){
+            attendScore = BigDecimal.ZERO;
+        }
         attendScore = attendScore.multiply(weightPdu.attendWeight());
         BigDecimal otherScore = staffPerformSummaryEntity.getOtherScore();  //其他绩效加分项
 //        if(otherScore.compareTo(BigDecimal.ZERO)==0){
@@ -30,8 +33,14 @@ public class StaffPerformUtil {
 //        }
 //        otherScore = otherScore.multiply(weightPdu.selfWeight());
         BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
+        if(goworkScore.compareTo(BigDecimal.ZERO)< 0){
+            goworkScore = BigDecimal.ZERO;
+        }
         goworkScore = goworkScore.multiply(weightPdu.goworkWeight());
         BigDecimal effectScore = total.add(staffPerformSummaryEntity.getEffectScore());  //效能
+        if(effectScore.compareTo(BigDecimal.ZERO)< 0){
+            effectScore = BigDecimal.ZERO;
+        }
         effectScore = effectScore.multiply(weightPdu.effectWeight());
         BigDecimal complainScore = staffPerformSummaryEntity.getComplainScore();  //自评不用加100
         if(complainScore.compareTo(BigDecimal.ZERO)==0){

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffPerformSummaryServiceImpl.java

@@ -84,6 +84,9 @@ public class StaffPerformSummaryServiceImpl extends AbstractCRUDServiceImpl<Staf
         }
         staffPerformSummaryEntity.setReviewScore(reviewScore.setScale(2,BigDecimal.ROUND_DOWN));
         BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
+        if(attendScore.compareTo(BigDecimal.ZERO)<0){
+            attendScore = BigDecimal.ZERO;
+        }
         attendScore = attendScore.multiply(weightPdu.attendWeight());
         staffPerformSummaryEntity.setAttendScore(attendScore.setScale(2,BigDecimal.ROUND_DOWN));
         BigDecimal complainScore = staffPerformSummaryEntity.getComplainScore();  //自评不用加100
@@ -93,9 +96,15 @@ public class StaffPerformSummaryServiceImpl extends AbstractCRUDServiceImpl<Staf
         complainScore = complainScore.multiply(weightPdu.selfWeight());
         staffPerformSummaryEntity.setComplainScore(complainScore.setScale(2,BigDecimal.ROUND_DOWN));
         BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
+        if(goworkScore.compareTo(BigDecimal.ZERO)<0){
+            goworkScore = BigDecimal.ZERO;
+        }
         goworkScore = goworkScore.multiply(weightPdu.goworkWeight());
         staffPerformSummaryEntity.setGoworkScore(goworkScore.setScale(2,BigDecimal.ROUND_DOWN));
         BigDecimal effectScore = total.add(staffPerformSummaryEntity.getEffectScore());  //效能
+        if(effectScore.compareTo(BigDecimal.ZERO)<0){
+            effectScore = BigDecimal.ZERO;
+        }
         effectScore = effectScore.multiply(weightPdu.effectWeight());
         staffPerformSummaryEntity.setEffectScore(effectScore.setScale(2,BigDecimal.ROUND_DOWN));