From 736a1375c6d2bdb528d902701f93e3c0e29dabc8 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Sun, 27 Aug 2023 13:44:29 +0800
Subject: [PATCH] debug

---
 .../gov/manage/GovProjectCollectionManage.java     | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 56755d8..2011b9c 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -233,8 +233,8 @@ public class GovProjectCollectionManage {
             saveBase.setId(oldBaseInfo.getId());
         }else{
             if(Objects.nonNull(saveBase.getBaseAreaCode())){
-                saveBase.setBaseAreaCode(saveBase.getBaseAreaCode() + BizConst.NINE_AREA_CODE_LAST);
                 saveBase.setAreaCode(saveBase.getBaseAreaCode());
+                saveBase.setBaseAreaCode(saveBase.getBaseAreaCode() + BizConst.NINE_AREA_CODE_LAST);
             }
             saveBase.setTongTime(LocalDateTime.now());
         }
@@ -242,9 +242,9 @@ public class GovProjectCollectionManage {
 
         // 2.保存 申报信息
         GovBizProjectApplyDTO apply = saveDTO.getApply();
-        apply.setBaseProjId(baseProjId);
-        apply.setBaseProjName(baseProjName);
         if(Objects.nonNull(apply)){
+            apply.setBaseProjId(baseProjId);
+            apply.setBaseProjName(baseProjName);
             GovBizProjectApply oldApply = projectApplyService.getOne(Wrappers.lambdaQuery(GovBizProjectApply.class)
                     .eq(GovBizProjectApply::getBaseProjId, baseProjId)
                     .last(BizConst.LIMIT_1));
@@ -254,8 +254,8 @@ public class GovProjectCollectionManage {
             if(Objects.nonNull(oldApply)){
                 saveApply.setId(oldApply.getId());
             }else{
-                if(Objects.nonNull(saveBase.getBaseAreaCode())){
-                    saveApply.setAreaCode(saveBase.getBaseAreaCode());
+                if(Objects.nonNull(saveBase.getAreaCode())){
+                    saveApply.setAreaCode(saveBase.getAreaCode());
                 }
                 saveApply.setTongTime(LocalDateTime.now());
             }
@@ -264,9 +264,9 @@ public class GovProjectCollectionManage {
 
         // 3.保存 审批信息
         GovBizProjectApproveDTO approve = saveDTO.getApprove();
-        approve.setBaseProjId(baseProjId);
-        approve.setBaseProjName(baseProjName);
         if(Objects.nonNull(approve)){
+            approve.setBaseProjId(baseProjId);
+            approve.setBaseProjName(baseProjName);
             GovBizProjectApprove oldApprove = approveService.getOne(Wrappers.lambdaQuery(GovBizProjectApprove.class)
                     .eq(GovBizProjectApprove::getBaseProjId, baseProjId)
                     .last(BizConst.LIMIT_1));
@@ -276,8 +276,8 @@ public class GovProjectCollectionManage {
             if(Objects.nonNull(oldApprove)){
                 saveApprove.setId(oldApprove.getId());
             }else{
-                if(Objects.nonNull(saveBase.getBaseAreaCode())){
-                    saveApprove.setAreaCode(saveBase.getBaseAreaCode());
+                if(Objects.nonNull(saveBase.getAreaCode())){
+                    saveApprove.setAreaCode(saveBase.getAreaCode());
                 }
                 saveApprove.setTongTime(LocalDateTime.now());
             }
@@ -286,9 +286,9 @@ public class GovProjectCollectionManage {
 
         // 4.保存 建设项目 实施信息
         GovBizProjectCimplementDTO cimplement = saveDTO.getCimplement();
-        cimplement.setBaseProjId(baseProjId);
-        cimplement.setBaseProjName(baseProjName);
         if(Objects.nonNull(cimplement)){
+            cimplement.setBaseProjId(baseProjId);
+            cimplement.setBaseProjName(baseProjName);
             GovBizProjectCimplement oldCimplement = cimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectCimplement.class)
                     .eq(GovBizProjectCimplement::getBaseProjId, baseProjId)
                     .last(BizConst.LIMIT_1));
@@ -298,8 +298,8 @@ public class GovProjectCollectionManage {
             if(Objects.nonNull(oldCimplement)){
                 saveCimplement.setId(oldCimplement.getId());
             }else{
-                if(Objects.nonNull(saveBase.getBaseAreaCode())){
-                    saveCimplement.setAreaCode(saveBase.getBaseAreaCode());
+                if(Objects.nonNull(saveBase.getAreaCode())){
+                    saveCimplement.setAreaCode(saveBase.getAreaCode());
                 }
                 saveCimplement.setTongTime(LocalDateTime.now());
             }
@@ -308,9 +308,9 @@ public class GovProjectCollectionManage {
 
         // 5.保存 运维项目 实施信息
         GovBizProjectMimplementDTO mimplement = saveDTO.getMimplement();
-        mimplement.setBaseProjId(baseProjId);
-        mimplement.setBaseProjName(baseProjName);
         if(Objects.nonNull(mimplement)){
+            mimplement.setBaseProjId(baseProjId);
+            mimplement.setBaseProjName(baseProjName);
             GovBizProjectMimplement oldMimplement = mimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectMimplement.class)
                     .eq(GovBizProjectMimplement::getBaseProjId, baseProjId)
                     .last(BizConst.LIMIT_1));
@@ -320,8 +320,8 @@ public class GovProjectCollectionManage {
             if(Objects.nonNull(oldMimplement)){
                 saveMimplement.setId(oldMimplement.getId());
             }else{
-                if(Objects.nonNull(saveBase.getBaseAreaCode())){
-                    saveMimplement.setAreaCode(saveBase.getBaseAreaCode());
+                if(Objects.nonNull(saveBase.getAreaCode())){
+                    saveMimplement.setAreaCode(saveBase.getAreaCode());
                 }
                 saveMimplement.setTongTime(LocalDateTime.now());
             }
@@ -337,8 +337,8 @@ public class GovProjectCollectionManage {
             GovBizProjectProcure saveProcure = BeanUtil.copyProperties(procure,GovBizProjectProcure.class);
             saveProcure.setBaseProjId(baseProjId);
 
-            if(Objects.nonNull(saveBase.getBaseAreaCode())){
-                saveProcure.setAreaCode(saveBase.getBaseAreaCode());
+            if(Objects.nonNull(saveBase.getAreaCode())){
+                saveProcure.setAreaCode(saveBase.getAreaCode());
             }
             if(Objects.isNull(procure.getId())){
                 saveProcure.setTongTime(LocalDateTime.now());