From 98eb534fbd866d5625e6f92515f8534da863a71d Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Sun, 8 Oct 2023 17:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E4=BA=AB=E5=B7=A5=E4=BD=9C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/flowable/biz/flow2/FlowService.java | 57 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
index 995c8b075c..43fe4e3284 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow2/FlowService.java
@@ -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();
 
     }