合并分支 'yjzx_dev' 到 'yjzx_test'

智库统计图调整

查看合并请求 !18

src/main/java/com/zzsn/thinktank/constants/CommonConstants.java

@@ -6,6 +6,10 @@ public class CommonConstants {
      */
     public static final String DIC_THINK_TANK_NATURE = "think_tank_nature";
     /**
+     * 智库影响力和地位字典key
+     */
+    public static final String DIC_INFLUENCE = "Influence";
+    /**
      * 国家中国id
      */
     public static final String CHINA_ID = "1405761925932109826";

src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java

@@ -921,7 +921,17 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
                 });
                 break;
             case "influencePosition":
-                mapList = processGrouping(list, ThinktankBasicInfo::getInfluencePosition, true,",");//影响力和地位
+                List<Map<String,Object>> mapListFilter = processGrouping(list, ThinktankBasicInfo::getInfluencePosition, true,",");//影响力和地位
+                List<SysDictItem> dictItemListPos = sysDictItemService.selectByItemCode(CommonConstants.DIC_INFLUENCE);
+                Map<String, String> dictMapPos = dictItemListPos.stream().collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText));
+                List<Map<String, Object>> finalMapList = mapList;
+                mapListFilter.forEach(map -> {
+                    String dictKey = MapUtil.getStr(map, "data");
+                    if (!dictKey.equals(CommonConstants.INFLUENCE_3) && MapUtil.isNotEmpty(dictMapPos) && dictMapPos.containsKey(dictKey)) {
+                        map.put("data", dictMapPos.get(dictKey));
+                        finalMapList.add(map);
+                    }
+                });
                 break;
             case "scale":
                 mapList = processGrouping(list, ThinktankBasicInfo::getScale, false,null);//智库规模