|
|
@ -770,7 +770,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> { |
|
|
|
BeanUtil.copyProperties(flowDelegateQuery, delegateQuery); |
|
|
|
ResultBean delegate = flowTaskService.delegate(delegateQuery); |
|
|
|
String userSid = flowDelegateQuery.getUserSid(); |
|
|
|
String assignee = flowDelegateQuery.getAssignee(); |
|
|
|
String assigneeSid = flowDelegateQuery.getAssignee(); |
|
|
|
String instanceId = flowDelegateQuery.getInstanceId(); |
|
|
|
String views = ""; |
|
|
|
if (StringUtils.isNotBlank(flowDelegateQuery.getViews())) { |
|
|
@ -781,7 +781,7 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> { |
|
|
|
if (userVoResultBean1.getData() != null) { |
|
|
|
userName = userVoResultBean1.getData().getName(); |
|
|
|
} |
|
|
|
ResultBean<SysUserVo> userVoResultBean2 = sysUserFeign.fetchBySid(assignee); |
|
|
|
ResultBean<SysUserVo> userVoResultBean2 = sysUserFeign.fetchBySid(assigneeSid); |
|
|
|
ProcessCommentDto processCommentDto = new ProcessCommentDto(); |
|
|
|
processCommentDto.setReviewerSid(userSid); |
|
|
|
if (userVoResultBean2.getData() != null) { |
|
|
@ -792,6 +792,59 @@ public class FlowService extends MybatisBaseService<FlowMapper, Flowable> { |
|
|
|
processCommentDto.setTime(new Date()); |
|
|
|
processCommentDto.setProcessId(instanceId); |
|
|
|
processCommentService.saveOrUpdateDto(processCommentDto); |
|
|
|
//加签内容推送至待阅
|
|
|
|
HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() |
|
|
|
.includeProcessVariables().taskId(delegateQuery.getTaskId()).singleResult(); |
|
|
|
if (historicTaskInstance == null) { |
|
|
|
return rb.setMsg("分享失败!"); |
|
|
|
} |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
String procDefId = historicTaskInstance.getProcessDefinitionId(); |
|
|
|
String procInsId = historicTaskInstance.getProcessInstanceId(); |
|
|
|
String nodeState = historicTaskInstance.getName(); |
|
|
|
String taskDefKey = historicTaskInstance.getTaskDefinitionKey(); |
|
|
|
messageFlowVo.setProcDefId(procDefId); |
|
|
|
messageFlowVo.setTaskId(delegateQuery.getTaskId()); |
|
|
|
messageFlowVo.setNodeState(nodeState); |
|
|
|
messageFlowVo.setProcInsId(procInsId); |
|
|
|
messageFlowVo.setTaskDefKey(taskDefKey); |
|
|
|
Map<String, Object> processVariables = historicTaskInstance.getProcessVariables(); |
|
|
|
MessageFlowableQuery mfq = new MessageFlowableQuery(); |
|
|
|
mfq.setUfVo(messageFlowVo); |
|
|
|
String createrOrgPath = (String) processVariables.get("createrOrgPath"); |
|
|
|
if (historicTaskInstance == null) { |
|
|
|
return rb.setMsg("分享失败!"); |
|
|
|
} |
|
|
|
//
|
|
|
|
String assignee = (String) processVariables.get("assignee"); |
|
|
|
ResultBean<SysUserVo> stringResultBean = sysUserFeign.fetchBySid(assignee); |
|
|
|
String assigneeName = ""; |
|
|
|
if (stringResultBean.getData() != null) { |
|
|
|
assigneeName = stringResultBean.getData().getName(); |
|
|
|
} |
|
|
|
|
|
|
|
Map<String, Object> app = new HashMap<>(); |
|
|
|
if (processVariables.get("app") != null) { |
|
|
|
app = (Map<String, Object>) processVariables.get("app"); |
|
|
|
} |
|
|
|
mfq.setAppMap(app); |
|
|
|
String businessSid = (String) processVariables.get("businessSid"); |
|
|
|
mfq.setBusinessSid(businessSid); |
|
|
|
mfq.setMsgContent(userName + "分享的流程审批,请查看"); |
|
|
|
// act_re_procdef
|
|
|
|
Map<String, String> process = processService.getProcessDefByDefId(historicTaskInstance.getProcessDefinitionId()); |
|
|
|
|
|
|
|
mfq.setModuleName(process.get("NAME_")); |
|
|
|
if (processVariables.containsKey("orderNames")) { |
|
|
|
mfq.setMsgTitle(processVariables.get("orderNames").toString()); |
|
|
|
} else { |
|
|
|
mfq.setMsgTitle(process.get("NAME_")); |
|
|
|
} |
|
|
|
mfq.setUserSids(assigneeSid); |
|
|
|
mfq.setOrgPath(createrOrgPath); |
|
|
|
mfq.setUserSid(assignee); |
|
|
|
mfq.setApplicationName(assigneeName); |
|
|
|
ResultBean<String> resultBean = messageFeign.pushMessageShare(mfq); |
|
|
|
return rb.success(); |
|
|
|
|
|
|
|
} |
|
|
|