修改团伙可视化数据bug

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Kshpropertice.java

@@ -14,7 +14,7 @@ public class Kshpropertice implements Serializable {
     private String label;
 
     private String imgType;
-    private String borderColor;
+    private String boderColor;
 
    /* @ApiModelProperty(value = "标签")
     private String describe;

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

@@ -319,7 +319,7 @@ public class HnTbStRygxController {
             conditionMap.put("children", childSet);
         }
         //查询出所有联系人的name
-        List<String> nameList = hnKshService.getGroupNameByRwid(taskId);
+        List<HnTbStRygx> nameList = hnKshService.getGroupNameByRwid(taskId);
         Hnkshresult hnTbStRygxDTOS = packingData(rythInfoByIdList, nameList);
         ArrayList<Object> re = new ArrayList<>();
         re.add(hnTbStRygxDTOS);
@@ -333,7 +333,7 @@ public class HnTbStRygxController {
      * @param nameList 联系人的身份证集合
      * @return
      */
-    public Hnkshresult packingData(List<Map<String, Object>> data, List<String> nameList) {
+    public Hnkshresult packingData(List<Map<String, Object>> data, List<HnTbStRygx> nameList) {
         Hnkshresult hnkshresult = new Hnkshresult();
         kshdata kshdata = new kshdata();
         List<HnTbStRygxDTO> resultList = new ArrayList<>();
@@ -343,8 +343,23 @@ public class HnTbStRygxController {
             Set<Map<String, String>> nameSet = (Set<Map<String, String>>) team.get("name");
             //拿出children
             Set<HnTbStRygx> childrenList = (Set<HnTbStRygx>) team.get("children");
-            HnTbStRygxDTO mergeDTOgjd = new HnTbStRygxDTO();
-            for (HnTbStRygx hnTbStRygx: childrenList) {
+
+            for (int i = 0; i < nameList.size(); i++) {
+                HnTbStRygxDTO mergeDTOgjd = new HnTbStRygxDTO();
+                String name = nameList.get(i).getName();
+                String description = nameList.get(i).getDescription();
+                mergeDTOgjd.setId(name);
+                mergeDTOgjd.setLabel(description+"\n"+name);
+                Kshpropertice kshpropertice = new Kshpropertice();
+                kshpropertice.setId(name);
+                kshpropertice.setLabel(description+"\n"+name);
+                kshpropertice.setImgType("idcard");
+                kshpropertice.setBoderColor("#ff0000");
+                mergeDTOgjd.setProperties(kshpropertice);
+                resultList.add(mergeDTOgjd);
+            }
+
+/*            for (HnTbStRygx hnTbStRygx: childrenList) {
                 String name = hnTbStRygx.getName();
                 String description = hnTbStRygx.getDescription();
                 mergeDTOgjd.setId(name);
@@ -357,7 +372,7 @@ public class HnTbStRygxController {
                 mergeDTOgjd.setProperties(kshpropertice);
                 break;
             }
-            resultList.add(mergeDTOgjd);
+            resultList.add(mergeDTOgjd);*/
             List<kshlinks> re =new ArrayList<>();
             for (Map<String, String> stringMap : nameSet) {
                 String sfzh = stringMap.get("sfzh");
@@ -389,7 +404,7 @@ public class HnTbStRygxController {
                 kshpropertice.setId(sfzh);
                 kshpropertice.setLabel(xm+"\n"+sfzh);
                 kshpropertice.setImgType("idcard");
-                kshpropertice.setBorderColor(null);
+                kshpropertice.setBoderColor(null);
                 mergeDTO.setProperties(kshpropertice);
                 resultList.add(mergeDTO);
                 //添加到kshadata

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

@@ -26,7 +26,7 @@ public interface HnTbStRygxMapper extends BaseMapper<HnTbStRygx> {
 
     List<HnTbStRygx> getAllSfzhList();
 
-    List<String> getGroupNameByRwid(@Param("taskId") String taskId);
+    List<HnTbStRygx> getGroupNameByRwid(@Param("taskId") String taskId);
 
     List<String> getBimgIsNullByTaskId(@Param("taskId")String taskId);
 

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

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

service/publicapi/src/main/java/com/founder/publicapi/service/HnTbStRygxService.java

@@ -22,5 +22,5 @@ public interface HnTbStRygxService extends IService<HnTbStRygx> {
 
     void getAndSaveImg(List<Map<String, Object>> rythInfoList, String taskId, Integer teamNum) throws Exception;
 
-    List<String> getGroupNameByRwid(String taskId);
+    List<HnTbStRygx> getGroupNameByRwid(String taskId);
 }

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/HnTbStRygxServiceImpl.java

@@ -112,7 +112,7 @@ public class HnTbStRygxServiceImpl extends ServiceImpl<HnTbStRygxMapper, HnTbStR
     }
 
     @Override
-    public List<String> getGroupNameByRwid(String taskId) {
+    public List<HnTbStRygx> getGroupNameByRwid(String taskId) {
         return baseMapper.getGroupNameByRwid(taskId);
     }