From e1b429a08cd4931bdde9b29a4b0968b61cf0d2c2 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 19 Feb 2024 11:35:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081861=20=E4=BC=81=E6=A0=87=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B--=E5=BC=BA=E5=88=B6=E6=92=A4?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8E=EF=BC=8C=E8=8D=89=E7=A8=BF=E4=B8=AD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/common/aspect/TranslationAspect.java | 42 +++++++++++++++++++
 .../impl/ProcessEsRecheckServiceImpl.java     |  3 +-
 .../laws/enterprise/job/ESRecheckPlanJob.java |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java
index 69cb57a3..c6093d29 100644
--- a/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java
+++ b/laws-base/laws-base-core/src/main/java/com/jero/common/aspect/TranslationAspect.java
@@ -1,5 +1,6 @@
 package com.jero.common.aspect;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -98,6 +99,13 @@ public class TranslationAspect {
         }
     }
 
+    /**
+     * 手动发起流程
+     * 流程发起将数据翻译后保存为json以供强制撤回后使用
+     * @param data
+     * @param user
+     * @return
+     */
     public String manualParseDictText(Object data, Object user) {
         List<SysDictItemCore> listDict = commonAPI.getDictItemAll();
         if (CollectionUtils.isEmpty(listDict)) {
@@ -108,6 +116,40 @@ public class TranslationAspect {
         return dataJsonObject.toJSONString();
     }
 
+    /**
+     * 自动发起流程的
+     * 流程发起将数据翻译后保存为json以供强制撤回后使用
+     * @param data
+     * @param user
+     * @return
+     */
+    public String autoParseDictText(Object data, Map<String, Object> user) {
+        List<SysDictItemCore> listDict = commonAPI.getDictItemAll();
+        if (CollectionUtils.isEmpty(listDict)) {
+            return "";
+        }
+        JSONObject dataJsonObject = (JSONObject) translateObject(data, listDict);
+        // 对人员进行翻译
+        dataJsonObject.put("personnelObj", this.translateUser(user, listDict));
+        return dataJsonObject.toJSONString();
+    }
+
+    private Object translateUser(Map<String, Object> user, List<SysDictItemCore> listDict) {
+        Map<String, Object> result = new HashMap<>();
+        for (Map.Entry<String, Object> entry : user.entrySet()) {
+            String value = (String) entry.getValue();
+            if (StrUtil.isBlank(value)) {
+                continue;
+            }
+            String code = "id";
+            String text = "CONCAT(realname, '(', username, ')')";
+            String table = "sys_user";
+            String textValue = translateDictValue(code, text, table, value, listDict);
+            result.put(entry.getKey(), value);
+            result.put(entry.getKey() + CommonConstant.DICT_TEXT_SUFFIX, textValue);
+        }
+        return result;
+    }
 
     private Object translateObject(Object record, List<SysDictItemCore> listDict) {
         ObjectMapper mapper = new ObjectMapper();
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 63e8a87d..d30034ce 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
@@ -149,8 +149,9 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
         // 获取第一个任务的taskId
         actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
+        recheckData.setFlowUser(null);
         // 手动翻译
-        String jsonData = translationAspect.manualParseDictText(recheckData, this.getUserMap(variables));
+        String jsonData = translationAspect.autoParseDictText(recheckData, this.getUserMap(variables));
         // 强制撤回
         common.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraftCustomUserId(common, ProcessTypeEnum.ES_RECHECK, jsonData, userId);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java
index 113ac85f..a5945f77 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java
@@ -130,7 +130,7 @@ public class ESRecheckPlanJob implements Job {
                     Date recheckDate = recheckPlan.getRecheckDate();
                     LocalDate recheckLocalDate = recheckDate.toInstant().atZone(ZoneId.of("Asia/Shanghai")).toLocalDate();
                     LocalDate minusMonths = recheckLocalDate.minusMonths(1);
-                    if (recheckPlan.getInProcessFlag().equals(YesOrNoEnum.YES.getValue())) {
+                    if (YesOrNoEnum.YES.getValue().equals(recheckPlan.getInProcessFlag())) {
                         // 已经发起过流程，不需要重复发起
                         log.info("企标编号为{}的企标已经达到复审日期前一个月，但是已经发起过复审流程，无需重复发起", es.getStandardNumber());
                         continue;