diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java index ea4bb06164..8bb7fb8ccc 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serializable; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -17,12 +16,12 @@ import java.util.Map; public class ItemResDetailConcatResultDTO implements Serializable { private static final long serialVersionUID = -3695200094740706700L; private List tableHeaderList; - private Map> dataMap; + private List> dataMap; //private List> dataList; public ItemResDetailConcatResultDTO(){ this.tableHeaderList=new ArrayList<>(); - this.dataMap=new HashMap<>(); + this.dataMap=new ArrayList<>(); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java index 4219fc8d2e..1030c10c32 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java @@ -617,27 +617,25 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl> dataList=new HashMap<>(); - //start - for (ConcatTableHeaderDTO header : tableHeaderList) { - String mapKey=header.getFormItemId(); - List mapValue=new ArrayList<>(); - - for (PrUserProjectResultEntity res : resultList) { - JSONObject originalData = JSON.parseObject(res.getOriginalData()); - String key = "field".concat(header.getFormItemId()); + List> dataMap=new ArrayList<>(); + for (PrUserProjectResultEntity res : resultList) { + JSONObject originalData = JSON.parseObject(res.getOriginalData()); + Map mapUnit=new HashMap<>(); + //start + for (ConcatTableHeaderDTO header : tableHeaderList) { + String key = "field".concat(header.getFormItemId()); //手机号、邮箱、身份证、单行文本: INPUT if (ProjectItemTypeEnum.INPUT.getValue().equals(header.getType())) { if (originalData.containsKey(key)) { if (StringUtils.isNotBlank(originalData.get(key).toString())) { - mapValue.add((String) originalData.get(key)); + mapUnit.put(header.getFormItemId(),(String) originalData.get(key)); } else { - mapValue.add(StrConstant.EPMETY_STR); + mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR); } } else { log.warn("没有当前的key:,可能用户没填写吧" + key); - mapValue.add(StrConstant.HYPHEN); + mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN); } } //省市联动: PROVINCE_CITY @@ -645,13 +643,13 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl provinceCityList = (List) originalData.get(key); if (!CollectionUtils.isEmpty(provinceCityList)) { - mapValue.add(StringUtils.join(provinceCityList, StrConstant.HYPHEN)); + mapUnit.put(header.getFormItemId(),StringUtils.join(provinceCityList, StrConstant.HYPHEN)); } else { - mapValue.add(StrConstant.EPMETY_STR); + mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR); } } else { log.warn("没有当前的key:,可能用户没填写吧" + key); - mapValue.add(StrConstant.HYPHEN); + mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN); } } @@ -661,20 +659,20 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl inputMap = (List) originalData.get(key); log.info("地理位置:" + JSON.toJSONString(inputMap, true)); if (!CollectionUtils.isEmpty(inputMap) && inputMap.size() == 3) { - mapValue.add(inputMap.get(2)); + mapUnit.put(header.getFormItemId(),inputMap.get(2)); } else { - mapValue.add(StrConstant.EPMETY_STR); + mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR); } } else { log.warn("没有当前的key:,可能用户没填写吧" + key); - mapValue.add(StrConstant.HYPHEN); + mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN); } } - } - dataList.put(mapKey,mapValue); - }//end + }//end + dataMap.add(mapUnit); + } resultDTO.setTableHeaderList(tableHeaderList); - resultDTO.setDataMap(dataList); + resultDTO.setDataMap(dataMap); return resultDTO; }