From cb4ee1588d7c1e58b2d2463c5b3b6d45dc18ad13 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 12 Jan 2024 17:48:47 +0800 Subject: [PATCH] =?UTF-8?q?fix(=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):=20?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/ISysDictService.java | 10 +++--- .../service/impl/SysDictServiceImpl.java | 36 +++++++++++++------ .../impl/ProcessFbEntryChangeServiceImpl.java | 29 ++++++++++++++- 3 files changed, 60 insertions(+), 15 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java index fc04d05e..a013a592 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java @@ -1,15 +1,15 @@ package com.jero.modules.system.service; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictQuery; import com.jero.modules.system.entity.SysDict; -import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.model.TreeSelectModel; +import java.util.List; +import java.util.Map; + /** *

* 字典表 服务类 @@ -227,4 +227,6 @@ public interface ISysDictService extends IService { void deleteById(String id); void deleteByIds(List idList); + + String queryDictText(String code, String keys); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index a6309f19..0e907742 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -5,19 +5,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; -import com.jero.common.constant.enums.LanguageEnum; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.DictModelMany; -import com.jero.common.util.MessageUtils; -import com.jero.common.util.SqlInjectionUtil; -import lombok.extern.slf4j.Slf4j; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.LanguageEnum; +import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.DictModel; +import com.jero.common.system.vo.DictModelMany; import com.jero.common.system.vo.DictQuery; +import com.jero.common.util.MessageUtils; +import com.jero.common.util.SqlInjectionUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysDict; import com.jero.modules.system.entity.SysDictItem; @@ -25,6 +22,7 @@ import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.model.TreeSelectModel; import com.jero.modules.system.service.ISysDictService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; @@ -231,10 +229,10 @@ public class SysDictServiceImpl extends ServiceImpl impl @Transactional public Integer saveMain(SysDict sysDict, List sysDictItemList) { int insert=0; - try{ + try{ sysDict.setIsTagDict(0); sysDict.setIsReadOnly(0); - insert = sysDictMapper.insert(sysDict); + insert = sysDictMapper.insert(sysDict); if (sysDictItemList != null) { for (SysDictItem entity : sysDictItemList) { entity.setDictId(sysDict.getId()); @@ -517,4 +515,22 @@ public class SysDictServiceImpl extends ServiceImpl impl } this.removeByIds(idList); } + + @Override + public String queryDictText(String code, String keys) { + SysDict sysDict = getOne(new LambdaQueryWrapper().eq(SysDict::getDictCode, code)); + List sysDictItemList = sysDictItemMapper.selectList( + new LambdaQueryWrapper().eq(SysDictItem::getDictId, sysDict.getId())); + String[] keyArr = keys.split(","); + List itemValueList = new ArrayList<>(); + for (String key : keyArr) { + Optional optionalSysDictItem = sysDictItemList.stream().filter(v -> key.equals(v.getItemValue())).findFirst(); + if (optionalSysDictItem.isPresent()){ + itemValueList.add(optionalSysDictItem.get().getItemText()); + }else { + itemValueList.add(key); + } + } + return String.join(",", itemValueList); + } } 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 b9503a98..ec4b382a 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,8 @@ package com.jero.modules.activiti.process.fb.service.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONPath; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.dto.message.SendMessageDTO; @@ -29,6 +31,7 @@ import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; @@ -74,6 +77,9 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl