Commit 01d9410e authored by 廖旭伟's avatar 廖旭伟

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

parent 30cf7ab9
...@@ -49,11 +49,15 @@ public class StaffPerformUtil { ...@@ -49,11 +49,15 @@ public class StaffPerformUtil {
summary = summary.add(reviewScore); summary = summary.add(reviewScore);
}else { }else {
summary = summary.add(weightPdu.reviewWeight()); summary = summary.add(weightPdu.reviewWeight());
staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(staffPerformSummaryEntity.getReviewScore()));
staffPerformSummaryEntity.setReviewScore(BigDecimal.ZERO);
} }
if(staffEntity.getAttendCheck()==1) { if(staffEntity.getAttendCheck()==1) {
summary = summary.add(attendScore); summary = summary.add(attendScore);
}else { }else {
summary = summary.add(weightPdu.attendWeight()); summary = summary.add(weightPdu.attendWeight());
staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(staffPerformSummaryEntity.getAttendScore()));
staffPerformSummaryEntity.setAttendScore(BigDecimal.ZERO);
} }
summary = summary.add(otherScore); summary = summary.add(otherScore);
...@@ -62,16 +66,23 @@ public class StaffPerformUtil { ...@@ -62,16 +66,23 @@ public class StaffPerformUtil {
summary = summary.add(effectScore); summary = summary.add(effectScore);
}else { }else {
summary = summary.add(weightPdu.effectWeight()); summary = summary.add(weightPdu.effectWeight());
staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(staffPerformSummaryEntity.getEffectScore()));
staffPerformSummaryEntity.setEffectScore(BigDecimal.ZERO);
} }
if(staffEntity.getGoworkCheck()==1) { if(staffEntity.getGoworkCheck()==1) {
summary = summary.add(goworkScore); summary = summary.add(goworkScore);
}else { }else {
summary = summary.add(weightPdu.goworkWeight()); summary = summary.add(weightPdu.goworkWeight());
staffPerformSummaryEntity.setErrorScore(staffPerformSummaryEntity.getErrorScore().subtract(staffPerformSummaryEntity.getGoworkScore()));
staffPerformSummaryEntity.setGoworkScore(BigDecimal.ZERO);
} }
if(staffEntity.getComplainCheck()==1){ if(staffEntity.getComplainCheck()==1){
summary = summary.add(complainScore); summary = summary.add(complainScore);
}else { }else {
summary = summary.add(weightPdu.selfWeight()); 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); staffPerformSummaryEntity.setTotalScore(summary);
if(staffPerformSummaryEntity.getAddTotalScore()!=null){ if(staffPerformSummaryEntity.getAddTotalScore()!=null){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment