From 978a5d8f3cbcb642e213374e6ff43544714d597b Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Fri, 7 Feb 2025 17:31:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/service/WorkPlanAllServiceImpl.java  |  2 +-
 .../train/service/PersonTrainServiceImpl.java  | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java
index 5caafa3..966e3f1 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/service/WorkPlanAllServiceImpl.java
@@ -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 {
                     //计算完成率
diff --git a/modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java b/modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java
index 230a7a7..2b745e0 100644
--- a/modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java
+++ b/modules/bmw/src/main/java/com/bonus/bmw/train/service/PersonTrainServiceImpl.java
@@ -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()) &&