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 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 user) { + List 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 user, List listDict) { + Map result = new HashMap<>(); + for (Map.Entry 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 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