考勤汇总表展示分数算法修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java

@@ -271,8 +271,8 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
                     if (temp.getEffectScore() != null) {
                         staffPerformSummaryEntity.setEffectScore(temp.getEffectScore());
                     }
-                    if (temp.getReviewScore() != null) {
-                        staffPerformSummaryEntity.setReviewScore(temp.getReviewScore());
+                    if (temp.getComplainScore() != null) {
+                        staffPerformSummaryEntity.setComplainScore(temp.getComplainScore());
                     }
                     BigDecimal erro = new BigDecimal(0);
                     erro = erro.add(staffPerformSummaryEntity.getReviewScore());

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

@@ -7,6 +7,7 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.pdu.WeightPdu;
+import com.mortals.xhx.common.utils.StaffPerformUtil;
 import com.mortals.xhx.module.staff.dao.StaffPerformSummaryDao;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
@@ -77,18 +78,20 @@ public class StaffPerformSummaryServiceImpl extends AbstractCRUDServiceImpl<Staf
 
     private void computeSummary(StaffPerformSummaryEntity staffPerformSummaryEntity, WeightPdu weightPdu){
         BigDecimal total = new BigDecimal(100);
-        BigDecimal reviewScore = total.add(staffPerformSummaryEntity.getReviewScore());  //评价
-        reviewScore = reviewScore.multiply(weightPdu.reviewWeight());
+        BigDecimal reviewScore = StaffPerformUtil.REVIEW_SCORE.add(staffPerformSummaryEntity.getReviewScore());  //评价
+        if(reviewScore.compareTo(BigDecimal.ZERO)<0){
+            reviewScore = BigDecimal.ZERO;
+        }
         staffPerformSummaryEntity.setReviewScore(reviewScore.setScale(2,BigDecimal.ROUND_DOWN));
         BigDecimal attendScore = total.add(staffPerformSummaryEntity.getAttendScore()); //考勤
         attendScore = attendScore.multiply(weightPdu.attendWeight());
         staffPerformSummaryEntity.setAttendScore(attendScore.setScale(2,BigDecimal.ROUND_DOWN));
-        BigDecimal otherScore = staffPerformSummaryEntity.getOtherScore();  //自评不用加100
-        if(otherScore.compareTo(BigDecimal.ZERO)==0){
-            otherScore = new BigDecimal(100);
+        BigDecimal complainScore = staffPerformSummaryEntity.getComplainScore();  //自评不用加100
+        if(complainScore.compareTo(BigDecimal.ZERO)==0){
+            complainScore = StaffPerformUtil.SCORE100;
         }
-        otherScore = otherScore.multiply(weightPdu.selfWeight());
-        staffPerformSummaryEntity.setOtherScore(otherScore.setScale(2,BigDecimal.ROUND_DOWN));
+        complainScore = complainScore.multiply(weightPdu.selfWeight());
+        staffPerformSummaryEntity.setComplainScore(complainScore.setScale(2,BigDecimal.ROUND_DOWN));
         BigDecimal goworkScore = total.add(staffPerformSummaryEntity.getGoworkScore());  //办件
         goworkScore = goworkScore.multiply(weightPdu.goworkWeight());
         staffPerformSummaryEntity.setGoworkScore(goworkScore.setScale(2,BigDecimal.ROUND_DOWN));