合并分支 'yjzx_dev' 到 'yjzx_test'

影响力和地位字典获取

查看合并请求 !16

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

@@ -9,4 +9,9 @@ public class CommonConstants {
      * 国家中国id
      */
     public static final String CHINA_ID = "1405761925932109826";
+
+    /**
+     * 影响力和地位-颠覆性重点智库对应编码
+     */
+    public static final String INFLUENCE_3 = "influence_3";
 }

src/main/java/com/zzsn/thinktank/controller/SysDictItemController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zzsn.thinktank.constants.CommonConstants;
 import com.zzsn.thinktank.entity.SysDict;
 import com.zzsn.thinktank.entity.SysDictItem;
 import com.zzsn.thinktank.entity.ThinktankBasicInfo;
@@ -84,6 +85,8 @@ public class SysDictItemController {
 						.distinct()
 						.collect(Collectors.toList());
 				queryWrapper.in(SysDictItem::getItemValue,distinctLangValuesList);
+			}else if(sysDict.getDictCode().equals("Influence")){
+				queryWrapper.ne(SysDictItem::getItemValue, CommonConstants.INFLUENCE_3);//特殊需求,过滤颠覆性重点智库
 			}
 			queryWrapper.eq(SysDictItem::getStatus,1);
 			Page<SysDictItem> page = new Page<SysDictItem>(pageNo, pageSize);

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

@@ -344,6 +344,27 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
                 baseInfo.setLangName(langName);
             }
         }
+        if(baseInfo!=null && StringUtils.isNotBlank(baseInfo.getInfluencePosition())){
+            String langName = "";
+            for(String str:Arrays.asList(baseInfo.getInfluencePosition().split(","))){
+                if(StringUtils.isNotBlank(str) && str.equals(CommonConstants.INFLUENCE_3)){
+                    continue;//特殊需求,过滤颠覆性重点智库
+                }
+                QueryWrapper query = new QueryWrapper();
+                query.in("item_value",str);
+                List<SysDictItem> sysDictItemList = sysDictItemService.list(query);
+                if(sysDictItemList!=null && sysDictItemList.size()>0){
+                    if(langName.equals("")){
+                        langName = sysDictItemList.get(0).getItemText();
+                    }else{
+                        langName = langName  + "," + sysDictItemList.get(0).getItemText();
+                    }
+                }
+            }
+            if(!langName.equals("")){
+                baseInfo.setLangName(langName);
+            }
+        }
     }
 
 
@@ -901,15 +922,6 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
                 break;
             case "influencePosition":
                 mapList = processGrouping(list, ThinktankBasicInfo::getInfluencePosition, true,",");//影响力和地位
-                Iterator<Map<String,Object>> iterator = mapList.iterator();
-                while (iterator.hasNext()) {
-                    Map<String,Object> map = iterator.next();
-                    if (map != null) {
-                        if(String.valueOf(map.get("data")).equals("颠覆性重点智库")){//特殊需求-不展示该类型
-                            iterator.remove();
-                        }
-                    }
-                }
                 break;
             case "scale":
                 mapList = processGrouping(list, ThinktankBasicInfo::getScale, false,null);//智库规模