bonus
/
lp_smz_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
15856 2025-02-07 17:31:33 +08:00
parent 040914ea8a
commit 978a5d8f3c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java
View File

@ -51,7 +51,7 @@ public class WorkPlanAllServiceImpl implements WorkPlanAllService {
if (list.size() > 0) {
for (WorkPlanAllBean item : list) {
//计算完成率
if (item.getTotalNum() == null || "".equals(item.getTotalNum())) {
if (item.getTotalNum() == null || "".equals(item.getTotalNum())||item.getWorkNum() == null || "".equals(item.getWorkNum())) {
item.setCompleteRate("0%");
} else {
//计算完成率

18
modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java
View File

@ -83,6 +83,16 @@ public class PersonTrainServiceImpl implements PersonTrainService {
personComprehensiveDao.updateRedPersonData(id);
}
}
//判断分数是否为空 20250207
if (StringUtils.isNull(bean.getCompanyExamScore())){
bean.setCompanyExamScore(0);
}
if (StringUtils.isNull(bean.getDeptExamScore())){
bean.setDeptExamScore(0);
}
if (StringUtils.isNull(bean.getTeamExamScore())){
bean.setTeamExamScore(0);
}
dao.updateWorkerLight(bean);
return i > 0 ? R.ok(Constants.INSERT_SUCCESS) : R.fail(Constants.INSERT_FAIL);
}
@ -152,12 +162,8 @@ public class PersonTrainServiceImpl implements PersonTrainService {
private void getLight(PersonTrainBean o) {
String light = "0";
if (o.getCompanyExamScore() != null &&
o.getDeptExamScore() != null &&
o.getTeamExamScore() != null) {
if (o.getCompanyExamScore() >= 80 &&
o.getDeptExamScore() >= 80 &&
o.getTeamExamScore() >= 80) {
if (o.getCompanyExamScore() != null && o.getDeptExamScore() != null && o.getTeamExamScore() != null) {
if (o.getCompanyExamScore() >= 80 && o.getDeptExamScore() >= 80 && o.getTeamExamScore() >= 80) {
light = "1";
o.setIsPass("1");
if (StringUtils.isNotEmpty(o.getTeamId()) &&