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

修改参数收集清单搜索条件

Browse Source
This commit is contained in:
高嵩
2023-08-04 14:40:36 +08:00
parent ad5606699c
commit 14854b3333
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+7 -3
View File
@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ZipUtil; import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7407,15 +7408,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Override @Override
public Result<?> queryDutyTerritory(String paramsManifestId) { public Result<?> queryDutyTerritory(String paramsManifestId) {
Map<String,String> resMap = new HashMap<>();
List<String> dtList = paramsCollectManifestEOMapper.queryDutyTerritory(paramsManifestId); List<String> dtList = paramsCollectManifestEOMapper.queryDutyTerritory(paramsManifestId);
List<SysDictItem> dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory"); List<SysDictItem> dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory");
Map<String,String> dictItemsMap = dtSdiList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); Map<String,String> dictItemsMap = dtSdiList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName));
JSONArray resList = new JSONArray();
if(ObjectUtils.isNotEmpty(dtList)){ if(ObjectUtils.isNotEmpty(dtList)){
for (String dtId : dtList) { for (String dtId : dtList) {
resMap.put(dtId,dictItemsMap.get(dtId)); JSONObject dt = new JSONObject();
dt.put("key",dtId);
dt.put("value",dictItemsMap.get(dtId));
resList.add(dt);
} }
} }
return Result.OK(resMap); return Result.OK(resList);
} }
} }