Merge branch 'f-xiaogu' into dev

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/mapper/vector/GhdkaMapper.java

@@ -39,13 +39,13 @@ public interface GhdkaMapper extends BaseMapper<GhdkaDTO> {
      * 根据idList，columnList 获取数据
      */
     List<Map<String, Object>> getInfoListByColumn(@Param("tableName") String tableName,
-                                              @Param("idList") List<String> idList,
-                                              @Param("columnList") List<String> columnList);
+                                                  @Param("idList") List<String> idList,
+                                                  @Param("columnList") List<String> columnList);
 
     /**
      * 根据id，columnList 获取数据
      */
     Map<String, Object> getInfoByColumn(@Param("tableName") String tableName,
-                                                  @Param("id") String id,
-                                                  @Param("columnList") List<String> columnList);
+                                        @Param("id") String id,
+                                        @Param("columnList") List<String> columnList);
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -541,15 +541,26 @@ public class FzssServiceImpl implements IFzssService {
 
             List<String> rawItemIdList = Arrays.asList(rawItemIds.split(","));
             // TODO 查询多地块信息
-            Map<String, Object> rawTable = ghdkaMapper.getInfoByColumn(rawTableName, rawItemIdList.get(0), columns);
+            List<Map<String, Object>> rawTables = ghdkaMapper.getInfoListByColumn(rawTableName, rawItemIdList, columns);
 
             // 构建地块返回结果
             Map<String, Object> dkMap = new HashMap<>();
-            if (rawTable != null && rawTable.containsKey("dkbm") && rawTable.containsKey("kzxxgydmc")) {
-                dkMap.put("dkbm", rawTable.get("dkbm"));// 地块编码
-                dkMap.put("kzxxgydmc", rawTable.get("kzxxgydmc"));// 地块类型
+            for (Map<String, Object> rawTable : rawTables) {
+                if (rawTable.containsKey("dkbm") && rawTable.containsKey("kzxxgydmc")) {
+                    if (dkMap.containsKey("dkbm")) {
+                        dkMap.put("dkbm", dkMap.get("dkbm") + "," + rawTable.get("dkbm"));// 地块编码
+                    }else{
+                        dkMap.put("dkbm", rawTable.get("dkbm"));// 地块编码
+                    }
+                    if (dkMap.containsKey("kzxxgydmc")) {
+                        dkMap.put("kzxxgydmc", dkMap.get("kzxxgydmc") + "," + rawTable.get("kzxxgydmc"));// 地块类型
+                    }else {
+                        dkMap.put("kzxxgydmc", rawTable.get("kzxxgydmc"));// 地块类型
+                    }
+                }
             }
 
+
             dkMap.put("landPrice", NumberUtil.double2TwoDecimal(selectionRes.getLandPrice()));// 地价
             dkMap.put("geom", selectionRes.getGeom());
             dkMap.put("id", selectionRes.getBsm());