fix 81258 项目合规评估流程-强制撤回的数据在发起人草稿中没有回显
This commit is contained in:
+6
-5
@@ -335,10 +335,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void startProcess(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
|
public void startProcess(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
|
||||||
//start 先保存一份初始草稿
|
|
||||||
processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
|
|
||||||
saveToDraft(processInfoVO);
|
|
||||||
//end 保存初始草稿结束
|
|
||||||
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
||||||
|
|
||||||
ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess();
|
ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess();
|
||||||
@@ -411,7 +408,11 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
|
|||||||
processInfoVO.setUserInfoMap(userInfoMap);
|
processInfoVO.setUserInfoMap(userInfoMap);
|
||||||
processHandleService.startProcess(processInfoVO);
|
processHandleService.startProcess(processInfoVO);
|
||||||
|
|
||||||
|
//start 先保存一份初始草稿
|
||||||
|
processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
|
||||||
|
processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
|
||||||
|
saveToDraft(processInfoVO);
|
||||||
|
//end 保存初始草稿结束
|
||||||
}
|
}
|
||||||
|
|
||||||
public void approveTask(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, boolean pass) {
|
public void approveTask(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, boolean pass) {
|
||||||
|
|||||||
+6
-4
@@ -126,10 +126,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void startProcess(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO) {
|
public void startProcess(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO) {
|
||||||
//start 先保存一份初始草稿
|
|
||||||
processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
|
|
||||||
saveToDraft(processInfoVO);
|
|
||||||
//end 保存初始草稿结束
|
|
||||||
ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
||||||
ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet();
|
ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet();
|
||||||
if (processProjectNotMet == null){
|
if (processProjectNotMet == null){
|
||||||
@@ -170,6 +167,11 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
|
|||||||
wrapper.set(LawsEvaluationNotMet::getState, RECTIFICATION);
|
wrapper.set(LawsEvaluationNotMet::getState, RECTIFICATION);
|
||||||
wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
|
wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
|
||||||
lawsEvaluationNotMetService.update(wrapper);
|
lawsEvaluationNotMetService.update(wrapper);
|
||||||
|
//start 先保存一份初始草稿
|
||||||
|
processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
|
||||||
|
processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
|
||||||
|
saveToDraft(processInfoVO);
|
||||||
|
//end 保存初始草稿结束
|
||||||
}
|
}
|
||||||
|
|
||||||
public void approveTask(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, boolean pass) {
|
public void approveTask(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, boolean pass) {
|
||||||
|
|||||||
+6
-4
@@ -296,10 +296,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void startProcess(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {
|
public void startProcess(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {
|
||||||
//start 先保存一份初始草稿
|
|
||||||
processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
|
|
||||||
saveToDraft(processInfoVO);
|
|
||||||
//end 保存初始草稿结束
|
|
||||||
ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
|
||||||
|
|
||||||
ProcessProjectStandard processProjectStandard = businessInfoDTO.getProcessProjectStandard();
|
ProcessProjectStandard processProjectStandard = businessInfoDTO.getProcessProjectStandard();
|
||||||
@@ -362,6 +359,11 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
|
|||||||
userInfoMap.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST, distinctAllResponsibleUnitLeaderListJoin);
|
userInfoMap.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST, distinctAllResponsibleUnitLeaderListJoin);
|
||||||
processInfoVO.setUserInfoMap(userInfoMap);
|
processInfoVO.setUserInfoMap(userInfoMap);
|
||||||
processHandleService.startProcess(processInfoVO);
|
processHandleService.startProcess(processInfoVO);
|
||||||
|
//保存一份初始草稿
|
||||||
|
processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
|
||||||
|
processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
|
||||||
|
saveToDraft(processInfoVO);
|
||||||
|
//end 保存初始草稿结束
|
||||||
}
|
}
|
||||||
|
|
||||||
public void submit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {
|
public void submit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {
|
||||||
|
|||||||
Reference in New Issue
Block a user