ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准法规入库/变更流程): 翻译问题

Browse Source
This commit is contained in:
yjz
2024-01-12 17:48:47 +08:00
parent 7348d5953b
commit cb4ee1588d
3 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
+6 -4
View File
@@ -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;
/**
* <p>
* 字典表 服务类
@@ -227,4 +227,6 @@ public interface ISysDictService extends IService<SysDict> {
void deleteById(String id);
void deleteByIds(List<String> idList);
String queryDictText(String code, String keys);
}
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+26 -10
View File
@@ -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<SysDictMapper, SysDict> impl
@Transactional
public Integer saveMain(SysDict sysDict, List<SysDictItem> 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<SysDictMapper, SysDict> impl
}
this.removeByIds(idList);
}
@Override
public String queryDictText(String code, String keys) {
SysDict sysDict = getOne(new LambdaQueryWrapper<SysDict>().eq(SysDict::getDictCode, code));
List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(
new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, sysDict.getId()));
String[] keyArr = keys.split(",");
List<String> itemValueList = new ArrayList<>();
for (String key : keyArr) {
Optional<SysDictItem> 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);
}
}