Commit 8b34bbc6 authored by 廖旭伟's avatar 廖旭伟

考勤汇总分数bug修改

parent 03fa9e91
...@@ -34,6 +34,9 @@ public class StaffPerformUtil { ...@@ -34,6 +34,9 @@ public class StaffPerformUtil {
BigDecimal effectScore = total.add(staffPerformSummaryEntity.getEffectScore()); //效能 BigDecimal effectScore = total.add(staffPerformSummaryEntity.getEffectScore()); //效能
effectScore = effectScore.multiply(weightPdu.effectWeight()); effectScore = effectScore.multiply(weightPdu.effectWeight());
BigDecimal complainScore = staffPerformSummaryEntity.getComplainScore(); //自评不用加100 BigDecimal complainScore = staffPerformSummaryEntity.getComplainScore(); //自评不用加100
if(complainScore.compareTo(BigDecimal.ZERO)==0){
complainScore = SCORE100;
}
complainScore = complainScore.multiply(weightPdu.selfWeight()); complainScore = complainScore.multiply(weightPdu.selfWeight());
BigDecimal summary = new BigDecimal(0); BigDecimal summary = new BigDecimal(0);
if(staffEntity.getReviewCheck()==1) { if(staffEntity.getReviewCheck()==1) {
......
...@@ -10,6 +10,7 @@ import com.mortals.framework.util.DateUtils; ...@@ -10,6 +10,7 @@ import com.mortals.framework.util.DateUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.pdu.WeightPdu; import com.mortals.xhx.common.pdu.WeightPdu;
import com.mortals.xhx.common.utils.StaffPerformUtil;
import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery; import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery; import com.mortals.xhx.module.check.model.vo.StaffCheckSummaryQuery;
import com.mortals.xhx.module.dept.model.DeptQuery; import com.mortals.xhx.module.dept.model.DeptQuery;
...@@ -131,7 +132,7 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro ...@@ -131,7 +132,7 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
staffPerformSummaryEntity.setEffectScore(BigDecimal.ZERO); staffPerformSummaryEntity.setEffectScore(BigDecimal.ZERO);
staffPerformSummaryEntity.setComplainScore(BigDecimal.ZERO); staffPerformSummaryEntity.setComplainScore(BigDecimal.ZERO);
staffPerformSummaryEntity.setAttendScore(BigDecimal.ZERO); staffPerformSummaryEntity.setAttendScore(BigDecimal.ZERO);
staffPerformSummaryEntity.setTotalScore(BigDecimal.ZERO); staffPerformSummaryEntity.setTotalScore(StaffPerformUtil.SCORE100);
staffPerformSummaryEntity.setErrorScore(BigDecimal.ZERO); staffPerformSummaryEntity.setErrorScore(BigDecimal.ZERO);
Map<String,Object> condition = new HashMap<>(); Map<String,Object> condition = new HashMap<>();
condition.put("year",year); condition.put("year",year);
......
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