|
@@ -387,10 +387,6 @@ public class GovProjectCollectionManage { |
|
|
String baseProjId = base.getBaseProjId(); |
|
|
String baseProjId = base.getBaseProjId(); |
|
|
String baseAreaCode = user.getRegionCode() + BizConst.NINE_AREA_CODE_LAST; |
|
|
String baseAreaCode = user.getRegionCode() + BizConst.NINE_AREA_CODE_LAST; |
|
|
String baseProjName = base.getBaseProjName(); |
|
|
String baseProjName = base.getBaseProjName(); |
|
|
//如果是新增的话 要生成 项目编号 |
|
|
|
|
|
if(StringUtils.isBlank(baseProjId) || BizProjectContant.ProjectCollection.DRAFT.equals(baseProjId)){ |
|
|
|
|
|
baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//1.保存基本信息 |
|
|
//1.保存基本信息 |
|
|
GovBizProjectBaseinfoDTO baseinfo = saveDTO.getBaseinfo(); |
|
|
GovBizProjectBaseinfoDTO baseinfo = saveDTO.getBaseinfo(); |
|
@@ -418,6 +414,12 @@ public class GovProjectCollectionManage { |
|
|
saveBase.setBizTime(LocalDateTime.now()); |
|
|
saveBase.setBizTime(LocalDateTime.now()); |
|
|
saveBase.setUpdateBy(user.getUsername()); |
|
|
saveBase.setUpdateBy(user.getUsername()); |
|
|
saveBase.setUpdateOn(LocalDateTime.now()); |
|
|
saveBase.setUpdateOn(LocalDateTime.now()); |
|
|
|
|
|
|
|
|
|
|
|
//如果是新增的话 要生成 项目编号 |
|
|
|
|
|
if(StringUtils.isBlank(baseProjId) || BizProjectContant.ProjectCollection.DRAFT.equals(baseProjId)){ |
|
|
|
|
|
baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
baseinfoService.saveOrUpdate(saveBase); |
|
|
baseinfoService.saveOrUpdate(saveBase); |
|
|
|
|
|
|
|
|
// 2.保存 申报信息 |
|
|
// 2.保存 申报信息 |
|
|