From a867b19b1826706a9e613c6d7d6e00a73b5f031a Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 25 Feb 2024 17:25:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082015=20=E4=BC=81=E6=A0=87=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B=EF=BC=88=E8=B5=B7=E8=8D=89=E4=BA=BA?=
 =?UTF-8?q?=E9=83=A8=E9=95=BF=E5=AE=A1=E6=89=B9=E3=80=81=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8C=96=E5=AE=A1=E6=89=B9=EF=BC=89=E8=BD=AC=E5=8A=9E=E5=90=8E?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=EF=BC=8C=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=8E=A5=E6=94=B6=E4=BA=BA=E5=91=98=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsRecheckServiceImpl.java     | 23 +++++++++++--------
 .../EnterpriseStandardRecheckPlanMapper.xml   |  2 --
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
index d30034ce..217c5ad9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
@@ -274,16 +274,19 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
                 Integer prcType = ProcessTypeEnum.ES_RECHECK.getValue();
                 actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
             }
-            Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
-            String taskName = task.getName();
-            switch (taskName) {
-                case DRAFTER_EDIT:
-                    taskService.setVariable(taskId, "mainDraftUser", userId);
-                    break;
-                case DRAFTER_LEADER_APPROVAL:
-                    taskService.setVariable(taskId, "mainDraftUserLeader", userId);
-                    break;
-            }
+        }
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        String taskName = task.getName();
+        switch (taskName) {
+            case DRAFTER_EDIT:
+                taskService.setVariable(taskId, "mainDraftUser", userId);
+                break;
+            case DRAFTER_LEADER_APPROVAL:
+                taskService.setVariable(taskId, "mainDraftUserLeader", userId);
+                break;
+            case STANDARDIZATION_APPROVAL:
+                taskService.setVariable(taskId, "finalStandardEngineer", userId);
+                break;
         }
         // 设置流程变量
         runtimeService.setVariable(processInstanceId, "pass", pass);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
index 72793274..9fe9645a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml
@@ -79,8 +79,6 @@
                     #{item}
                 </foreach>
             </if>
-        GROUP BY
-            s.standard_number, p.create_time
         ORDER BY
             p.create_time DESC
 </select>