WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

责任领域一级--排序

Browse Source
This commit is contained in:
zhn
2023-10-20 18:05:41 +08:00
parent 5e57cf894f
commit 0fe9dc4501
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java
+1 -1
View File
@@ -26,7 +26,7 @@ public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
@Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.item_text asc")
public List<SysDictItem> selectItemsOrderBySortOrder(String dictCode);
@Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0")
@Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0 ORDER BY sys_dict_item.sort_order ASC")
List<SysDictItem> selectItemsAll();
/**
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
+13 -15
View File
@@ -2,21 +2,24 @@ package com.jero.modules.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CacheConstant;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.vo.DictModel;
import com.jero.modules.enums.DictCodeEnum;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.mapper.SysDictItemMapper;
import com.jero.modules.system.service.ISysDictItemService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -275,16 +278,11 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
}
return flag;
}).collect(Collectors.toList());
Map<String, List<SysDictItem>> result = null;
if(CollectionUtils.isNotEmpty(sysDictItemByDictCode)){
result = sysDictItems.stream().filter(sysDict -> {
boolean flag = false;
if (StringUtils.isNotEmpty(sysDict.getStatNode())) {
flag = true;
}
return flag;
}).collect(Collectors.groupingBy(SysDictItem::getStatNode));
List<String> statNodeList = sysDictItemByDictCode.stream().map(SysDictItem::getStatNode).distinct().collect(Collectors.toList());
Map<String, List<SysDictItem>> result = new LinkedHashMap<>();
for (String node : statNodeList) {
List<SysDictItem> collect = sysDictItemByDictCode.stream().filter(e -> node.equals(e.getStatNode())).collect(Collectors.toList());
result.put(node,collect);
}
return result;
}