合并分支 'yjzx_dev' 到 'yjzx_test'

字典关联字典值

查看合并请求 !8

src/main/java/com/zzsn/thinktank/entity/ThinktankBasicInfo.java

@@ -116,6 +116,9 @@ public class ThinktankBasicInfo extends Model<ThinktankBasicInfo> {
   //语言中文名称
   @TableField(exist = false)
   private String langName;
+  //智库性质名称
+  @TableField(exist = false)
+  private String natureName;
   public List<String> toList(){
     List<String> list = new ArrayList<>();
     list.add(getValue(id));

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

@@ -298,6 +298,7 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
         ThinktankInfoVo thinktankInfoVo = new ThinktankInfoVo();
         // 获取基础信息
         ThinktankBasicInfo baseInfo = this.getById(id);
+        setDictValue(baseInfo);
         thinktankInfoVo.setBasicInfo(baseInfo);
         // 获取OTT信息
         ThinktankOttInfo ottInfo = thinktankOttInfoMapper.getOttInfoByBaseCode(baseInfo.getCodeId());
@@ -312,6 +313,30 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
         return thinktankInfoVo;
     }
 
+
+    /**
+     * 关联字典值
+     */
+    public void setDictValue(ThinktankBasicInfo baseInfo) {
+        if(baseInfo!=null && StringUtils.isNotBlank(baseInfo.getNature())){
+            QueryWrapper query = new QueryWrapper();
+            query.eq("item_value",baseInfo.getNature());
+            List<SysDictItem> sysDictItemList = sysDictItemService.list(query);
+            if(sysDictItemList!=null && sysDictItemList.size()>0){
+                baseInfo.setNatureName(sysDictItemList.get(0).getItemText());
+            }
+        }
+        if(baseInfo!=null && StringUtils.isNotBlank(baseInfo.getLang())){
+            QueryWrapper query = new QueryWrapper();
+            query.eq("item_value",baseInfo.getLang());
+            List<SysDictItem> sysDictItemList = sysDictItemService.list(query);
+            if(sysDictItemList!=null && sysDictItemList.size()>0){
+                baseInfo.setLangName(sysDictItemList.get(0).getItemText());
+            }
+        }
+    }
+
+
     /**
      * 收藏/取消收藏智库
      * @param id 智库id