From 05e30d1ab4b50b0a8fe9c524479261e021c653d6 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 Jan 2024 15:34:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/system/api/ISysBaseAPI.java | 1 + .../system/service/impl/SysBaseApiImpl.java | 16 +++++++ .../entity/ProcessProjectStandardTerm.java | 6 +++ .../xml/ProcessProjectStandardTermMapper.xml | 44 +++++++++---------- .../ProcessProjectStandardService.java | 16 ++++++- 5 files changed, 57 insertions(+), 26 deletions(-) diff --git a/laws-base/laws-base-api/jero-system-local-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java b/laws-base/laws-base-api/jero-system-local-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java index 3313f039..87b30444 100644 --- a/laws-base/laws-base-api/jero-system-local-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java +++ b/laws-base/laws-base-api/jero-system-local-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java @@ -350,4 +350,5 @@ public interface ISysBaseAPI extends CommonAPI { */ List loadDictItemByKeyword(String dictCode, String keyword, Integer pageSize); + String translateByDictMap(Map dictMap, String keys); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java index cf05517e..59f025ac 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java @@ -33,6 +33,7 @@ import com.jero.modules.system.mapper.*; import com.jero.modules.system.service.*; import com.jero.modules.system.util.SecurityUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.sequence.KeepCommand; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; @@ -1166,6 +1167,21 @@ public class SysBaseApiImpl implements ISysBaseAPI { return sysDictService.loadDict(dictCode, keyword, pageSize); } + @Override + public String translateByDictMap(Map dictMap, String keys) { + if (keys == null){ + return null; + } + String[] keyList = keys.split(","); + List resultList = new ArrayList<>(); + for (String key : keyList) { + if (dictMap.containsKey(key)){ + resultList.add(dictMap.get(key)); + } + } + return String.join(",",resultList); + } + @Override public Map> translateManyDict(String dictCodes, String keys) { List dictCodeList = Arrays.asList(dictCodes.split(",")); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java index 8a365c84..ae4e7cc0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java @@ -138,6 +138,12 @@ public class ProcessProjectStandardTerm { @ApiModelProperty(value="设计工程师") private String designEngineer; + /** + * 设计工程师 + */ + @ApiModelProperty(value="设计工程师") + private String designEngineer_dictText; + /** * 抄送人员 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml index 1c92e48d..bce1656c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml @@ -39,16 +39,15 @@ select + ppstu.id term_user_id, + ppstu.not_involved, + ppstu.assess_results, + ppstu.model_series, + ppstu.description, + ppstu.file_id, + ppstu.design_engineer, - , - ppstu.id term_user_id, - ppstu.not_involved, - ppstu.assess_results, - ppstu.model_series, - ppstu.description, - ppstu.file_id, - ppstu.design_engineer from process_project_standard_term ppst left join process_project_standard_term_user ppstu on ppst.id = ppstu.term_id where ppst.process_id = #{processId} @@ -85,10 +83,6 @@ select - - - - , ppstu.id term_user_id, ppstu.not_involved, ppstu.assess_results, ppstu.description, ppstu.file_id, ppstu.design_engineer + + + from process_project_standard_term ppst left join process_project_standard_term_user ppstu on ppst.id = ppstu.term_id where ppst.process_id = #{processId} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 0a783eab..e014242d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -165,6 +165,9 @@ public class ProcessProjectStandardService extends ServiceImpl modelSeriesDict = sysBaseAPI.queryDictItemsByCode("model_series"); + Map modelSeriesDictMap = CollStreamUtil.toMap(modelSeriesDict, DictModel::getValue, DictModel::getText); + List dictModels = sysBaseAPI.queryDictItemsByCode("assess_results"); Map assessResultsMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText); //给条款中保存关联的信息 @@ -234,6 +240,10 @@ public class ProcessProjectStandardService extends ServiceImpl0){ @@ -390,7 +400,7 @@ public class ProcessProjectStandardService extends ServiceImpl designEngineerList = Arrays.asList(designEngineers.split(",")); designEngineerIds.addAll(designEngineerList); updateWrapper.set(ProcessProjectStandardTermUser::getDesignEngineer, designEngineerList.get(0)); + updateWrapper.set(ProcessProjectStandardTermUser::getParentExecutionId, executionId); termUserService.update(updateWrapper); if (designEngineerList.size() >= 2){ @@ -676,6 +687,7 @@ public class ProcessProjectStandardService extends ServiceImpl variables = new HashMap<>();