绩效开关计算分数规则修改

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

@@ -49,11 +49,15 @@ public class StaffPerformUtil {
             summary = summary.add(reviewScore);
         }else {
             summary = summary.add(weightPdu.reviewWeight());
+            staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(staffPerformSummaryEntity.getReviewScore()));
+            staffPerformSummaryEntity.setReviewScore(BigDecimal.ZERO);
         }
         if(staffEntity.getAttendCheck()==1) {
             summary = summary.add(attendScore);
         }else {
             summary = summary.add(weightPdu.attendWeight());
+            staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(staffPerformSummaryEntity.getAttendScore()));
+            staffPerformSummaryEntity.setAttendScore(BigDecimal.ZERO);
         }
 
         summary = summary.add(otherScore);
@@ -62,16 +66,23 @@ public class StaffPerformUtil {
             summary = summary.add(effectScore);
         }else {
             summary = summary.add(weightPdu.effectWeight());
+            staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(staffPerformSummaryEntity.getEffectScore()));
+            staffPerformSummaryEntity.setEffectScore(BigDecimal.ZERO);
         }
         if(staffEntity.getGoworkCheck()==1) {
             summary = summary.add(goworkScore);
         }else {
             summary = summary.add(weightPdu.goworkWeight());
+            staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(staffPerformSummaryEntity.getGoworkScore()));
+            staffPerformSummaryEntity.setGoworkScore(BigDecimal.ZERO);
         }
         if(staffEntity.getComplainCheck()==1){
             summary = summary.add(complainScore);
         }else {
             summary = summary.add(weightPdu.selfWeight());
+            BigDecimal complainScoreErro = SCORE100.subtract(staffPerformSummaryEntity.getComplainScore());
+            staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(BigDecimal.ZERO.subtract(complainScoreErro)));
+            staffPerformSummaryEntity.setComplainScore(BigDecimal.ZERO);
         }
         staffPerformSummaryEntity.setTotalScore(summary);
         if(staffPerformSummaryEntity.getAddTotalScore()!=null){