From f4194874547815ed8e362c9717fe7b62e5a9d522 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 8 Dec 2023 10:57:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2-=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5=20=E4=B8=8D?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AnnualReportTaskNameConstant.java   |  2 +-
 .../entity/ProcessEsAnnualReport.java          |  7 +++++++
 .../impl/ProcessEsAnnualReportServiceImpl.java | 18 ++++++++++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/AnnualReportTaskNameConstant.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/AnnualReportTaskNameConstant.java
index 730cd1da..b4030d8f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/AnnualReportTaskNameConstant.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/AnnualReportTaskNameConstant.java
@@ -6,7 +6,7 @@ package com.jero.modules.activiti.process.esAnnualReport.entity;
  */
 public class AnnualReportTaskNameConstant {
     public static final String STANDARD_ENGINEER_INIT = "标准化工程师发起";
-    public static final String CONTACT_USER_DISTRIBUTE = "各部所联络人填写/下发任务";
+    public static final String CONTACT_USER_DISTRIBUTE = "各部所联络人 填写/下发任务";
     public static final String WORK_GROUP_COLLECT = "工作组/所联络人填写企标";
     public static final String COLLECT_LEADER_APPROVAL = "收集联络人主管级领导审批";
     public static final String CONTACT_USER_COLLECT = "各部所联络人汇总";
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
index 63cac4ec..3e953fc5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
@@ -369,6 +369,13 @@ public class ProcessEsAnnualReport implements Serializable {
     @ApiModelProperty(value = "收集联络人主管级领导")
     private String collectUserLeader;
 
+    /**
+     * 执行Id
+     */
+    @ApiModelProperty(value = "执行Id")
+    private String executionId;
+
+
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index e7132d4b..e3712807 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -154,7 +154,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 ProcessEsAnnualReport annualReport = annualReportDataVO.getDataList().get(0);
                 boolean distribute = annualReport.getDistributeFlag().equals("1");
                 String contactUserLeaderLeader = annualReport.getContactUserLeaderLeader();
-                taskService.setVariableLocal(taskId, "distribute", distribute);
+                taskService.setVariable(taskId, "distribute", distribute);
                 // 获取是否分发
                 if (distribute) {
                     String workGroupUsers = annualReport.getWorkGroupUser();
@@ -164,11 +164,15 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                     taskService.setVariableLocal(taskId, "workGroupUserList", workGroupUserList);
                     taskService.setVariableLocal(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
                 } else {
+                    // 获取执行id
+                    String executionId = task.getExecutionId();
                     // 保存联络人主管级上级领导
                     dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
+                    dataList.forEach(data -> data.setExecutionId(executionId));
+                    dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
                     // 不分发，入库存表
                     saveBatch(dataList);
-                    taskService.setVariableLocal(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
+                    taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
                 }
                 break;
             case WORK_GROUP_COLLECT:
@@ -205,6 +209,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
     @Override
     public AnnualReportDataVO getHandleData(String taskId) {
         String userId = UserUtils.getUserId();
+        String executionId = taskService.createTaskQuery().taskId(taskId).singleResult().getExecutionId();
         if (!actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("任务不存在");
         }
@@ -245,16 +250,17 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 break;
             case CONTACT_USER_COLLECT:
                 wrapper.eq(ProcessEsAnnualReport::getContactUser, userId);
+                wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
+                wrapper.eq(ProcessEsAnnualReport::getExecutionId, executionId);
                 annualReportDataVO.setDataList(list(wrapper));
                 break;
             case CONTACT_USER_LEADER_APPROVAL:
+                // 获取上一个节点的审批人
                 wrapper.eq(ProcessEsAnnualReport::getContactUserLeaderLeader, userId);
+                wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
+                wrapper.eq(ProcessEsAnnualReport::getExecutionId, executionId);
                 annualReportDataVO.setDataList(list(wrapper));
                 break;
-//            case CONTACT_USER_EDIT:
-//                wrapper.eq(ProcessEsAnnualReport::getContactUser, userId);
-//                annualReportDataVO.setDataList(list(wrapper));
-//                break;
             case STANDARD_ENGINEER_COLLECT:
                 wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
                 annualReportDataVO.setDataList(list(wrapper));