@@ -207,15 +207,14 @@ public class GovProjectCollectionManage { | |||||
* @return | * @return | ||||
*/ | */ | ||||
public String save(GovBizProjectSaveDTO saveDTO) { | public String save(GovBizProjectSaveDTO saveDTO) { | ||||
String baseProjId = saveDTO.getBaseProjId(); | |||||
GovBizProjectBaseinfoDTO base = saveDTO.getBaseinfo(); | |||||
String baseProjId = base.getBaseProjId(); | |||||
String baseProjName = base.getBaseProjName(); | |||||
//如果是新增的话 要生成 项目编号 | //如果是新增的话 要生成 项目编号 | ||||
if(StringUtils.isBlank(baseProjId)){ | if(StringUtils.isBlank(baseProjId)){ | ||||
baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO); | baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO); | ||||
} | } | ||||
String baseProjName = saveDTO.getBaseProjName(); | |||||
//1.保存基本信息 | //1.保存基本信息 | ||||
GovBizProjectBaseinfoDTO baseinfo = saveDTO.getBaseinfo(); | GovBizProjectBaseinfoDTO baseinfo = saveDTO.getBaseinfo(); | ||||
baseinfo.setBaseProjId(baseProjId); | baseinfo.setBaseProjId(baseProjId); | ||||
@@ -48,7 +48,7 @@ public class GovBizProjectApplyDTO implements Serializable { | |||||
private String baseProjSys; | private String baseProjSys; | ||||
@ApiModelProperty("关联IRS应用编号") | @ApiModelProperty("关联IRS应用编号") | ||||
private String baseProjSysCpde; | |||||
private String baseProjSysCode; | |||||
@ApiModelProperty("一本账重大应用名称") | @ApiModelProperty("一本账重大应用名称") | ||||
private String baseAccountAppName; | private String baseAccountAppName; | ||||
@@ -55,7 +55,7 @@ public class GovBizProjectApply implements Serializable { | |||||
private String baseProjSys; | private String baseProjSys; | ||||
@ApiModelProperty("关联IRS应用编号") | @ApiModelProperty("关联IRS应用编号") | ||||
private String baseProjSysCpde; | |||||
private String baseProjSysCode; | |||||
@ApiModelProperty("一本账重大应用名称") | @ApiModelProperty("一本账重大应用名称") | ||||
private String baseAccountAppName; | private String baseAccountAppName; | ||||
@@ -50,7 +50,7 @@ public class GovBizProjectApplyVO implements Serializable { | |||||
private String baseProjSys; | private String baseProjSys; | ||||
@ApiModelProperty("关联IRS应用编号") | @ApiModelProperty("关联IRS应用编号") | ||||
private String baseProjSysCpde; | |||||
private String baseProjSysCode; | |||||
@ApiModelProperty("一本账重大应用名称") | @ApiModelProperty("一本账重大应用名称") | ||||
private String baseAccountAppName; | private String baseAccountAppName; | ||||