fix: 81260 【全局】非发起节点点击保存,发起人会变成点击保存的人员
This commit is contained in:
+19
@@ -325,6 +325,25 @@ public class ActFlowCommonService {
|
|||||||
* @param dueTime
|
* @param dueTime
|
||||||
*/
|
*/
|
||||||
public void updateProcessAll(String processInstanceId, String userId, String prcName, String prcMes, Integer prcType, Date dueTime) {
|
public void updateProcessAll(String processInstanceId, String userId, String prcName, String prcMes, Integer prcType, Date dueTime) {
|
||||||
|
ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
|
||||||
|
process.setPrcName(prcName);
|
||||||
|
process.setPrcMes(prcMes);
|
||||||
|
process.setDueTime(dueTime);
|
||||||
|
process.setPrcType(prcType);
|
||||||
|
processAllService.updateById(process);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新流程主表
|
||||||
|
*
|
||||||
|
* @param processInstanceId
|
||||||
|
* @param userId
|
||||||
|
* @param prcName
|
||||||
|
* @param prcMes
|
||||||
|
* @param prcType
|
||||||
|
* @param dueTime
|
||||||
|
*/
|
||||||
|
public void updateProcessAllWithUserId(String processInstanceId, String userId, String prcName, String prcMes, Integer prcType, Date dueTime) {
|
||||||
ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
|
ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
|
||||||
process.setCreateUserId(userId);
|
process.setCreateUserId(userId);
|
||||||
process.setPrcName(prcName);
|
process.setPrcName(prcName);
|
||||||
|
|||||||
+1
-1
@@ -246,7 +246,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
|
|||||||
actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);
|
actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);
|
||||||
// 根据流程实例id更新流程总表
|
// 根据流程实例id更新流程总表
|
||||||
Integer prcType = ProcessTypeEnum.ES_INIT_CHANGE.getValue();
|
Integer prcType = ProcessTypeEnum.ES_INIT_CHANGE.getValue();
|
||||||
actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
|
actFlowCommonService.updateProcessAllWithUserId(processInstanceId, mainDraftUser, prcName, null, prcType, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
|
private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
|
||||||
|
|||||||
+1
-1
@@ -159,7 +159,7 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
|
|||||||
String prcMes = common.getPrcMes();
|
String prcMes = common.getPrcMes();
|
||||||
Date dueTime = common.getDueTime();
|
Date dueTime = common.getDueTime();
|
||||||
Integer prcType = ProcessTypeEnum.ES_RECHECK.getValue();
|
Integer prcType = ProcessTypeEnum.ES_RECHECK.getValue();
|
||||||
actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
|
actFlowCommonService.updateProcessAllWithUserId(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<String, Object> setVariables(Map<String, Object> flowUser) {
|
public Map<String, Object> setVariables(Map<String, Object> flowUser) {
|
||||||
|
|||||||
+1
-1
@@ -276,7 +276,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
|
|||||||
commonVO.setProcessInstanceId(processInstanceId);
|
commonVO.setProcessInstanceId(processInstanceId);
|
||||||
actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
|
actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
|
||||||
// 更新流程信息
|
// 更新流程信息
|
||||||
actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
|
actFlowCommonService.updateProcessAllWithUserId(processInstanceId, mainDraftUser, prcName, null, prcType, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user