From c31e70ed4b22e48280de074b4f9efa3f28b764d9 Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 9 Nov 2023 14:18:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=81=9A=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessFbStandardConsultationMapper.java | 3 --- .../impl/ProcessFbEntryChangeServiceImpl.java | 19 ++++++++++++++++++- .../common/service/ILawsCommonService.java | 7 +++++++ .../service/impl/LawsCommonServiceImpl.java | 3 ++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationMapper.java index df71b977..f3fa2093 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/mapper/ProcessFbStandardConsultationMapper.java @@ -1,8 +1,5 @@ package com.jero.modules.activiti.process.fb.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardConsultation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index 64e37676..856a2e9c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -1,6 +1,7 @@ package com.jero.modules.activiti.process.fb.service.impl; import com.alibaba.fastjson.JSON; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.util.UUIDUtils; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey; @@ -13,10 +14,14 @@ import com.jero.modules.activiti.process.fb.util.ObjectToMapUtil; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; +import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.util.CurrentUserUtil; +import com.jero.modules.tag.entity.LawsTag; +import com.jero.modules.tag.enums.TableNameEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; @@ -24,8 +29,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** @@ -43,6 +50,8 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class); - processFbEntryChange.setBusinessMap(map); + + // 处理字典翻译 + List fieldList = lawsCommonMapper.getFieldList(TableNameEnum.getTableName(processFbEntryChange.getSource())); + // 新增编辑显示 + fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue() + .equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList()); + Map stringObjectMap = lawsCommonService.processResultMap(map, fieldList); + + processFbEntryChange.setBusinessMap(stringObjectMap); processInfoVO.setBusinessInfoDTO(processFbEntryChange); return processInfoVO; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index cab0bdda..97de5b3c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -90,6 +90,13 @@ public interface ILawsCommonService { **/ Map getByIdAndModule(String id, String module, String type, String standardNumber); + /** + * @Author: liao + * @Date: 2023/11/9 14:16 + * @Description: 对返回数据做处理 + **/ + public Map processResultMap(Map initMap, List fieldList); + /** * @Author: liao * @Date: 2023/8/24 13:52 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 1ff828d8..43fc564c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -349,7 +349,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { * @Date: 2023/8/25 11:52 * @Description: 对返回的数据做处理（详情页） **/ - private Map processResultMap(Map initMap, List fieldList) { + @Override + public Map processResultMap(Map initMap, List fieldList) { List dictItemList = getDictItemList(fieldList); Map resultMap = new LinkedHashMap<>(); String id = (String) initMap.get("id");