数据分析修改bug

service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java

@@ -37,6 +37,7 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -356,7 +357,10 @@ public class HnTbStRygxController {
 
 
         //查询出所有联系人的name
-        List<HnTbStRygx> nameList = hnKshService.getGroupNameByRwid(taskId);
+        List<HnTbStRygx> nameLists = hnKshService.getGroupNameByRwid(taskId);
+        Map<String, List<HnTbStRygx>> map = nameLists.stream().collect(Collectors.groupingBy(HnTbStRygx::getName));
+        List<List<HnTbStRygx>> nameList = map.values().stream()
+                .collect(Collectors.toList());
         kshdata hnTbStRygxDTOS = packingData(rythInfoByIdList, nameList);
         ArrayList<Object> re = new ArrayList<>();
         re.add(hnTbStRygxDTOS);
@@ -370,7 +374,7 @@ public class HnTbStRygxController {
      * @param nameList 联系人的身份证集合
      * @return
      */
-    public kshdata packingData(List<Map<String, Object>> data, List<HnTbStRygx> nameList) {
+    public kshdata packingData(List<Map<String, Object>> data, List<List<HnTbStRygx>> nameList) {
 //        ThKshresult thKshresult = new ThKshresult();
 //        Hnkshresult hnkshresult = new Hnkshresult();
         kshdata kshdata = new kshdata();
@@ -383,11 +387,10 @@ public class HnTbStRygxController {
             Set<Map<String, String>> nameSet = (Set<Map<String, String>>) team.get("name");
             //拿出children
             Set<HnTbStRygx> childrenList = (Set<HnTbStRygx>) team.get("children");
-
             for (int i = 0; i < nameList.size(); i++) {
                 HnTbStRygxDTO mergeDTOgjd = new HnTbStRygxDTO();
-                String name = nameList.get(i).getName();
-                String description = nameList.get(i).getDescription();
+                String name = nameList.get(i).get(i).getName();
+                String description = nameList.get(i).get(i).getDescription();
                 mergeDTOgjd.setId(name);
                 mergeDTOgjd.setLabel(description+"\n"+name);
                 Kshpropertice kshpropertice = new Kshpropertice();

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/HnTbStRygxMapper.xml

@@ -60,7 +60,7 @@
         group by name
     </select>
     <select id="getGroupNameByRwid" resultType="com.founder.commonutils.model.newPublicEntity.hnkshEntity.HnTbStRygx">
-        select name,description from ksh_st_rygx where rwid = #{taskId} group by name
+        select name,description from ksh_st_rygx where rwid = #{taskId}
     </select>
 
     <select id="getBimgIsNullByTaskId" resultType="java.lang.String">