修改参数收集清单搜索条件
This commit is contained in:
+7
-3
@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.ZipUtil;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
@@ -7407,15 +7408,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
|
||||
@Override
|
||||
public Result<?> queryDutyTerritory(String paramsManifestId) {
|
||||
Map<String,String> resMap = new HashMap<>();
|
||||
List<String> dtList = paramsCollectManifestEOMapper.queryDutyTerritory(paramsManifestId);
|
||||
List<SysDictItem> dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory");
|
||||
Map<String,String> dictItemsMap = dtSdiList.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName));
|
||||
JSONArray resList = new JSONArray();
|
||||
if(ObjectUtils.isNotEmpty(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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user