优化代码结构

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -367,8 +367,9 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             workProjectChange.setProjectId(modifyProjectVo.getProjectId());
             workProjectChange.setModifyTime(new Date());
             workProjectChange.setChangeType(2);
-
+            if (null != workProject.getWorkTime()) {
                 workProjectChange.setModifyBefore(workProject.getWorkTime().toString());
+            }
             workProjectChange.setModifyAfter(modifyProjectVo.getWorkTime().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
             workProjectChange.setReason(modifyProjectVo.getWorkTimeReason());
             workProjectChanges.add(workProjectChange);
@@ -378,7 +379,9 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             workProjectChange.setProjectId(modifyProjectVo.getProjectId());
             workProjectChange.setModifyTime(new Date());
             workProjectChange.setChangeType(1);
+            if (null != workProject.getCostBudget()) {
                 workProjectChange.setModifyBefore(workProject.getCostBudget().toString());
+            }
             workProjectChange.setModifyAfter(modifyProjectVo.getCostBudget().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
             workProjectChange.setReason(modifyProjectVo.getCostBudgetReason());
             workProjectChanges.add(workProjectChange);
@@ -559,11 +562,14 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             if (StringUtils.isBlank(modifyProjectVo.getCostBudgetReason())) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY);
             }
-            if (workProject.getCostBudget().compareTo(modifyProjectVo.getCostBudget()) == 0) {
+            if (null != workProject.getCostBudget()) {
+                if (modifyProjectVo.getCostBudget().compareTo(workProject.getCostBudget()) == 0) {
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
                 }
             }
 
+        }
+
         // 校验工时预算
         if (null != modifyProjectVo.getWorkTime()) {
             if (BigDecimal.ZERO.compareTo(modifyProjectVo.getWorkTime()) > 0) {
@@ -572,11 +578,14 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             if (StringUtils.isBlank(modifyProjectVo.getWorkTimeReason())) {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY);
             }
-            if (workProject.getWorkTime().compareTo(modifyProjectVo.getWorkTime()) == 0) {
+            if (null !=workProject.getWorkTime()) {
+                if (modifyProjectVo.getWorkTime().compareTo(workProject.getWorkTime()) == 0) {
                     throw new BaseCustomException(BASE_RESP_CODE_ENUM.theNewContent_IsEqual_ToTheOriginal_Content);
                 }
             }
 
+        }
+
         // 校验负责人
         if (!workProject.getManagerId().equals(modifyProjectVo.getManagerId())) {
             if (StringUtils.isBlank(modifyProjectVo.getManagerIdReason())) {