|
@@ -404,7 +404,6 @@ public class GovProjectCollectionManage { |
|
|
//项目名去重 |
|
|
//项目名去重 |
|
|
checkName(baseProjName,baseProjId); |
|
|
checkName(baseProjName,baseProjId); |
|
|
GovBizProjectBaseinfo saveBase = BeanUtil.copyProperties(baseinfo,GovBizProjectBaseinfo.class); |
|
|
GovBizProjectBaseinfo saveBase = BeanUtil.copyProperties(baseinfo,GovBizProjectBaseinfo.class); |
|
|
saveBase.setBaseProjId(baseProjId); |
|
|
|
|
|
saveBase.setBaseProjName(baseProjName); |
|
|
saveBase.setBaseProjName(baseProjName); |
|
|
saveBase.setIsEffective(BizProjectContant.ProjectCollection.IS_EFFECTIVE); |
|
|
saveBase.setIsEffective(BizProjectContant.ProjectCollection.IS_EFFECTIVE); |
|
|
if(Objects.nonNull(oldBaseInfo)){ |
|
|
if(Objects.nonNull(oldBaseInfo)){ |
|
@@ -423,6 +422,7 @@ public class GovProjectCollectionManage { |
|
|
//如果是新增的话 要生成 项目编号 |
|
|
//如果是新增的话 要生成 项目编号 |
|
|
if(StringUtils.isBlank(baseProjId) || BizProjectContant.ProjectCollection.DRAFT.equals(baseProjId)){ |
|
|
if(StringUtils.isBlank(baseProjId) || BizProjectContant.ProjectCollection.DRAFT.equals(baseProjId)){ |
|
|
baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO); |
|
|
baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO); |
|
|
|
|
|
saveBase.setBaseProjId(baseProjId); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
baseinfoService.saveOrUpdate(saveBase); |
|
|
baseinfoService.saveOrUpdate(saveBase); |
|
|