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 cfd500f..2ae3f77 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 @@ -244,12 +244,12 @@ public class GovProjectCollectionManage { if(Objects.nonNull(oldBaseInfo)){ saveBase.setId(oldBaseInfo.getId()); }else{ - if(Objects.nonNull(saveBase.getBaseAreaCode())){ - saveBase.setAreaCode(saveBase.getBaseAreaCode()); - saveBase.setBaseAreaCode(saveBase.getBaseAreaCode() + BizConst.NINE_AREA_CODE_LAST); - } saveBase.setTongTime(LocalDateTime.now()); } + if(Objects.nonNull(saveBase.getBaseAreaCode())){ + saveBase.setAreaCode(saveBase.getBaseAreaCode()); + saveBase.setBaseAreaCode(saveBase.getBaseAreaCode() + BizConst.NINE_AREA_CODE_LAST); + } saveBase.setBizTime(LocalDateTime.now()); baseinfoService.saveOrUpdate(saveBase); @@ -267,11 +267,11 @@ public class GovProjectCollectionManage { if(Objects.nonNull(oldApply)){ saveApply.setId(oldApply.getId()); }else{ - if(Objects.nonNull(saveBase.getAreaCode())){ - saveApply.setAreaCode(saveBase.getAreaCode()); - } saveApply.setTongTime(LocalDateTime.now()); } + if(Objects.nonNull(saveBase.getAreaCode())){ + saveApply.setAreaCode(saveBase.getAreaCode()); + } saveApply.setBizTime(LocalDateTime.now()); projectApplyService.saveOrUpdate(saveApply); } @@ -290,11 +290,11 @@ public class GovProjectCollectionManage { if(Objects.nonNull(oldApprove)){ saveApprove.setId(oldApprove.getId()); }else{ - if(Objects.nonNull(saveBase.getAreaCode())){ - saveApprove.setAreaCode(saveBase.getAreaCode()); - } saveApprove.setTongTime(LocalDateTime.now()); } + if(Objects.nonNull(saveBase.getAreaCode())){ + saveApprove.setAreaCode(saveBase.getAreaCode()); + } saveApprove.setBizTime(LocalDateTime.now()); approveService.saveOrUpdate(saveApprove); } @@ -314,11 +314,11 @@ public class GovProjectCollectionManage { if(Objects.nonNull(oldCimplement)){ saveCimplement.setId(oldCimplement.getId()); }else{ - if(Objects.nonNull(saveBase.getAreaCode())){ - saveCimplement.setAreaCode(saveBase.getAreaCode()); - } saveCimplement.setTongTime(LocalDateTime.now()); } + if(Objects.nonNull(saveBase.getAreaCode())){ + saveCimplement.setAreaCode(saveBase.getAreaCode()); + } saveCimplement.setBizTime(LocalDateTime.now()); cimplementService.saveOrUpdate(saveCimplement); } @@ -339,11 +339,11 @@ public class GovProjectCollectionManage { if(Objects.nonNull(oldMimplement)){ saveMimplement.setId(oldMimplement.getId()); }else{ - if(Objects.nonNull(saveBase.getAreaCode())){ - saveMimplement.setAreaCode(saveBase.getAreaCode()); - } saveMimplement.setTongTime(LocalDateTime.now()); } + if(Objects.nonNull(saveBase.getAreaCode())){ + saveMimplement.setAreaCode(saveBase.getAreaCode()); + } saveMimplement.setBizTime(LocalDateTime.now()); mimplementService.saveOrUpdate(saveMimplement); }