From 14854b3333cbb0c5e158e5081858eb2a7b5fce61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 4 Aug 2023 14:40:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 7b2336b1b..8bffda745 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -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 queryDutyTerritory(String paramsManifestId) { - Map resMap = new HashMap<>(); List dtList = paramsCollectManifestEOMapper.queryDutyTerritory(paramsManifestId); List dtSdiList = sysDictItemService.selectItemsByDictCode("duty_territory"); Map 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); } }