Merge remote-tracking branch 'origin/dev_question_naire' into dev_question_naire

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/ItemResDetailConcatResultDTO.java

@@ -5,9 +5,10 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
- * @Description TODO
+ * @Description 联系人组件
  * @Author yinzuomei
  * @Date 2021/9/22 2:54 下午
  */
@@ -15,11 +16,12 @@ import java.util.List;
 public class ItemResDetailConcatResultDTO implements Serializable {
     private static final long serialVersionUID = -3695200094740706700L;
     private List<ConcatTableHeaderDTO> tableHeaderList;
-    private List<List<String>> dataList;
+    private List<Map<String,String>> dataMap;
+    //private List<List<String>> dataList;
 
     public ItemResDetailConcatResultDTO(){
         this.tableHeaderList=new ArrayList<>();
-        this.dataList=new ArrayList<>();
+        this.dataMap=new ArrayList<>();
     }
 }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@@ -617,25 +617,25 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
             tableHeaderList.add(headerDTO);
         }
 
-        List<List<String>> dataList=new ArrayList<>();
+        List<Map<String,String>> dataMap=new ArrayList<>();
+
         for (PrUserProjectResultEntity res : resultList) {
-            List<String> userAnswer=new ArrayList<>();
             JSONObject originalData = JSON.parseObject(res.getOriginalData());
-
+            Map<String,String> 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())) {
-                            userAnswer.add((String) originalData.get(key));
+                            mapUnit.put(header.getFormItemId(),(String) originalData.get(key));
                         } else {
-                            userAnswer.add(StrConstant.EPMETY_STR);
+                            mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR);
                         }
                     } else {
                         log.warn("没有当前的key:,可能用户没填写吧" + key);
-                        userAnswer.add(StrConstant.HYPHEN);
+                        mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN);
                     }
                 }
                 //省市联动： PROVINCE_CITY
@@ -643,13 +643,13 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                     if (originalData.containsKey(key)) {
                         List<String> provinceCityList = (List<String>) originalData.get(key);
                         if (!CollectionUtils.isEmpty(provinceCityList)) {
-                            userAnswer.add(StringUtils.join(provinceCityList,StrConstant.HYPHEN));
+                            mapUnit.put(header.getFormItemId(),StringUtils.join(provinceCityList, StrConstant.HYPHEN));
                         } else {
-                            userAnswer.add(StrConstant.EPMETY_STR);
+                            mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR);
                         }
                     } else {
                         log.warn("没有当前的key:,可能用户没填写吧" + key);
-                        userAnswer.add(StrConstant.HYPHEN);
+                        mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN);
                     }
                 }
 
@@ -659,21 +659,20 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                         List<String> inputMap = (List<String>) originalData.get(key);
                         log.info("地理位置：" + JSON.toJSONString(inputMap, true));
                         if (!CollectionUtils.isEmpty(inputMap) && inputMap.size() == 3) {
-                            userAnswer.add(inputMap.get(2));
+                            mapUnit.put(header.getFormItemId(),inputMap.get(2));
                         } else {
-                            userAnswer.add(StrConstant.EPMETY_STR);
+                            mapUnit.put(header.getFormItemId(),StrConstant.EPMETY_STR);
                         }
                     } else {
                         log.warn("没有当前的key:,可能用户没填写吧" + key);
-                        userAnswer.add(StrConstant.HYPHEN);
+                        mapUnit.put(header.getFormItemId(),StrConstant.HYPHEN);
                     }
                 }
-
-            }
-            dataList.add(userAnswer);
+            }//end
+            dataMap.add(mapUnit);
         }
         resultDTO.setTableHeaderList(tableHeaderList);
-        resultDTO.setDataList(dataList);
+        resultDTO.setDataMap(dataMap);
         return resultDTO;
     }