From cbda282732c61b461158e258a51a36fc62f2a797 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 18 Dec 2023 09:07:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E4=BA=8C=E7=BA=A7=E9=A9=B3=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualInitServiceImpl.java  | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index e1b86418..97fd41b3 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -210,6 +210,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String taskName = task.getName();
         String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
+        String approvalUser = (String) runtimeService.getVariable(executionId, "approvalUser");
         switch (taskName) {
             case CONTACT_USER_SELECT:
                 wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
@@ -223,9 +224,12 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId);
                 break;
             case CONTACT_USER_EDIT:
+                wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
+                wrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser);
                 wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
                 break;
             case MAIN_DRAFT_WRITE:
+                wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
                 wrapper.eq(ProcessEsAnnualInit::getPrcMainDraftUser, userId);
                 break;
             case CONTACT_USER_COLLECT:
@@ -268,6 +272,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         wrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue());
         updateWrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
         updateWrapper.eq(ProcessEsAnnualInit::getDelFlag, YesOrNoEnum.NO.getValue());
+        String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
+        String approvalUser = (String) runtimeService.getVariable(executionId, "approvalUser");
         switch (taskName) {
             case CONTACT_USER_SELECT:
                 dataList = annualInitData.getDataList();
@@ -284,6 +290,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                         // 找到所有数据，然后设置驳回标志位
                         updateWrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
                         updateWrapper.set(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
+                        updateWrapper.set(ProcessEsAnnualInit::getExecutionId, executionId);
                         update(updateWrapper);
                     } else {
                         dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
@@ -308,12 +315,20 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                     dataList.forEach(data -> data.setExecutionId(executionId));
                     taskService.setVariable(taskId, "mainDraftUserList", mainDraftUserSet);
                 } else {
-                    dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
+                    // 找到对应数据，然后设置驳回标志位
+                    updateWrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
+                    updateWrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser);
+                    updateWrapper.set(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
+                    update(updateWrapper);
                 }
-                // 获取执行id
-                dataList.forEach(data -> data.setExecutionId(executionId));
-                saveOrUpdateBatch(dataList);
                 break;
+            case CONTACT_USER_EDIT:
+                dataList = annualInitData.getDataList();
+                dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
+                taskService.setVariable(taskId, "approvalUser", annualInitData.getDataList().get(0).getApprovalUser());
+                dataList.forEach(data -> data.setExecutionId(executionId));
+                dataList.forEach(data -> data.setApprovalUser(annualInitData.getDataList().get(0).getApprovalUser()));
+                saveOrUpdateBatch(dataList);
             case MAIN_DRAFT_WRITE:
                 dataList = annualInitData.getDataList();
                 dataList.forEach(d -> d.setMainDraftingUser(userId));