|
@@ -569,8 +569,8 @@ public class GovProjectCollectionManage { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public GovBizProjectDetailVO operationDraftDetail(Long draftId) { |
|
|
|
|
|
GovBizProjectDetailVO res = new GovBizProjectDetailVO(); |
|
|
|
|
|
|
|
|
public GovOperationProjectDetailVO operationDraftDetail(Long draftId) { |
|
|
|
|
|
GovOperationProjectDetailVO res = new GovOperationProjectDetailVO(); |
|
|
//查询草稿表 |
|
|
//查询草稿表 |
|
|
GovOperationProjectDraft draft = operationProjectDraftService.getById(draftId); |
|
|
GovOperationProjectDraft draft = operationProjectDraftService.getById(draftId); |
|
|
|
|
|
|
|
@@ -582,7 +582,7 @@ public class GovProjectCollectionManage { |
|
|
//1.基本信息 |
|
|
//1.基本信息 |
|
|
res.setBaseProjId(draft.getBaseProjId()); |
|
|
res.setBaseProjId(draft.getBaseProjId()); |
|
|
res.setBaseProjName(draft.getBaseProjName()); |
|
|
res.setBaseProjName(draft.getBaseProjName()); |
|
|
res.setBaseinfo(BeanUtil.copyProperties(draft, GovBizProjectBaseinfoVO.class)); |
|
|
|
|
|
|
|
|
res.setBaseinfo(BeanUtil.copyProperties(draft, GovOperationProjectBaseinfoVO.class)); |
|
|
|
|
|
|
|
|
//2.申报信息 |
|
|
//2.申报信息 |
|
|
res.setApply(BeanUtil.copyProperties(draft, GovBizProjectApplyVO.class)); |
|
|
res.setApply(BeanUtil.copyProperties(draft, GovBizProjectApplyVO.class)); |
|
@@ -1163,7 +1163,7 @@ public class GovProjectCollectionManage { |
|
|
return BizConst.SAVE_SUCCESS; |
|
|
return BizConst.SAVE_SUCCESS; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public String operationDraft(GovBizProjectSaveDTO saveDTO, UserInfoDetails user) { |
|
|
|
|
|
|
|
|
public String operationDraft(GovOperationProjectSaveDTO saveDTO, UserInfoDetails user) { |
|
|
if(Objects.isNull(user)){ |
|
|
if(Objects.isNull(user)){ |
|
|
user = LoginUserUtil.loginUserDetail(); |
|
|
user = LoginUserUtil.loginUserDetail(); |
|
|
} |
|
|
} |
|
@@ -1184,7 +1184,7 @@ public class GovProjectCollectionManage { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//1.保存基本信息 |
|
|
//1.保存基本信息 |
|
|
GovBizProjectBaseinfoDTO base = saveDTO.getBaseinfo(); |
|
|
|
|
|
|
|
|
GovOperationProjectBaseinfoDTO base = saveDTO.getBaseinfo(); |
|
|
String baseProjId = base.getBaseProjId(); |
|
|
String baseProjId = base.getBaseProjId(); |
|
|
String baseProjName = base.getBaseProjName(); |
|
|
String baseProjName = base.getBaseProjName(); |
|
|
//要生成 草稿的项目编号 |
|
|
//要生成 草稿的项目编号 |
|
|