Merge branch 'master' into yjzx_test

# Conflicts:
#	src/main/java/com/zzsn/thinktank/controller/ThinktankBasicInfoController.java
#	src/main/java/com/zzsn/thinktank/entity/ThinktankBasicInfo.java
#	src/main/java/com/zzsn/thinktank/mapper/ThinktankBasicInfoMapper.java
#	src/main/java/com/zzsn/thinktank/service/ThinktankBasicInfoService.java
#	src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java
#	src/main/java/com/zzsn/thinktank/vo/ThinktankBasicInfoListVo.java
#	src/main/resources/application.yml

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -86,4 +89,64 @@ public class ThinktankBasicInfo extends Model<ThinktankBasicInfo> {
   //所属洲id
   @TableField(exist = false)
   private String continentId;
+  //语言
+  private String lang;
+  //运营状态
+  private String operateStatus;
+  //营利性质
+  private String profitNature;
+  //智库性质
+  private String nature;
+  //影响力和地位
+  private String influencePosition;
+  //人员规模
+  private String staffSize;
+  //智库规模
+  private String scale;
+  //成果类型
+  private String achievementType;
+  //资金来源
+  private String fundsSource;
+
+  public List<String> toList(){
+    List<String> list = new ArrayList<>();
+    list.add(getValue(id));
+    list.add(getValue(codeId));
+    list.add(getValue(chineseWhole));
+    list.add(getValue(chineseSimple));
+    list.add(getValue(englishWhole));
+    list.add(getValue(englishSimple));
+    list.add(getValue(officialWebsite));
+    list.add(getValue(belongCountry));
+    list.add(getValue(lang));
+    list.add(getValue(operateStatus));
+    list.add(getValue(profitNature));
+    list.add(getValue(nature));
+    list.add(getValue(tagName));
+    list.add(getValue(influencePosition));
+    list.add(getValue(staffSize));
+    list.add(getValue(scale));
+    list.add(getValue(achievementType));
+    list.add(getValue(fundsSource));
+    list.add(getValue(originalWhole));
+    list.add(getValue(originalSimple));
+    list.add(getValue(biographicalNotes));
+    list.add(getValue(establishTime));
+    if (charge != null) {
+      list.add(String.valueOf(charge));
+    } else {
+      list.add("");
+    }
+    list.add(getValue(address));
+    list.add(getValue(belongUnit));
+    return list;
+  }
+
+  private String getValue(String value){
+    if (StringUtils.isEmpty(value)) {
+      value = "";
+    }
+    return value;
+  }
+
 }

src/main/java/com/zzsn/thinktank/mapper/DataImportMapper.java

+package com.zzsn.thinktank.mapper;
+
+import com.zzsn.thinktank.vo.DataChangeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 批量导入数据
+ *
+ * @author lkg
+ * @date 2024/8/22
+ */
+public interface DataImportMapper {
+
+    /**
+     * 获取字典值列表
+     *
+     * @param dictCode 字段编码
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<DataChangeVO> dictItemList(@Param("dictCode") String dictCode);
+
+    /**
+     * 获取标签实体列表
+     *
+     * @param labelId 标签id
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<DataChangeVO> labelEntityList(@Param("labelId") String labelId);
+}

src/main/java/com/zzsn/thinktank/mapper/InfoSourceGroupMapMapper.java

@@ -2,6 +2,7 @@ package com.zzsn.thinktank.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zzsn.thinktank.entity.InfoSourceGroupMap;
+import com.zzsn.thinktank.vo.ThinkTankSourceVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,4 +20,13 @@ public interface InfoSourceGroupMapMapper extends BaseMapper<InfoSourceGroupMap>
     void deleteBySourceId(@Param("sourceId") String sourceId);
 
     void deleteBySourceIds(@Param("groupId") String groupId, @Param("sourceIds") List<String> sourceIds);
+
+    /**
+     * 获取智库关联的信息源集合
+     *
+     * @param groupIds 智库id集合
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<ThinkTankSourceVO> listOfThinkTank(@Param("groupIds") List<String> groupIds);
 }

src/main/java/com/zzsn/thinktank/mapper/ThinktankBasicInfoMapper.java

@@ -8,6 +8,7 @@ import com.zzsn.thinktank.vo.ThinktankBasicInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -26,6 +27,21 @@ public interface ThinktankBasicInfoMapper extends BaseMapper<ThinktankBasicInfo>
     List<ThinktankBasicInfoExportVo> getExportList(ThinktankBasicInfoListVo thinktankBasicInfoListVo);
 
     /**
+     * 根据搜索条件获取导出列表
+     *
+     * @param ids           智库id集合
+     * @param codeId        主库编码
+     * @param typeId        国家id
+     * @param thinktankName 智库名称
+     * @param tagId         研究领域id
+     * @param keyword       关键词
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<ThinktankBasicInfo> exportListByCondition(@Param("ids") List<String> ids, @Param("codeId") String codeId, @Param("typeId") String typeId,
+                                                   @Param("thinktankName") String thinktankName, @Param("tagId") String tagId, @Param("keyword") String keyword);
+
+    /**
      * 根据id更新智库基本信息
      * @param id 智库id
      * @param lang 语言

src/main/java/com/zzsn/thinktank/service/DataImportService.java

+package com.zzsn.thinktank.service;
+
+import com.zzsn.thinktank.vo.DataChangeVO;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author lkg
+ * @date 2024/8/23
+ */
+public interface DataImportService {
+
+    /**
+     * 获取字典值列表
+     *
+     * @param dictCode 字段编码
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<DataChangeVO> dictItemList(String dictCode);
+
+    /**
+     * 获取标签实体列表
+     *
+     * @param labelId 标签id
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<DataChangeVO> labelEntityList(String labelId);
+}

src/main/java/com/zzsn/thinktank/service/DataImportServiceImpl.java

+package com.zzsn.thinktank.service;
+
+import com.zzsn.thinktank.mapper.DataImportMapper;
+import com.zzsn.thinktank.vo.DataChangeVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ *
+ *
+ * @author lkg
+ * @date 2024/8/23
+ */
+@Service
+public class DataImportServiceImpl implements DataImportService{
+
+    @Resource
+    private DataImportMapper dataImportMapper;
+
+    @Override
+    public List<DataChangeVO> dictItemList(String dictCode) {
+        return dataImportMapper.dictItemList(dictCode);
+    }
+
+    @Override
+    public List<DataChangeVO> labelEntityList(String labelId) {
+        return dataImportMapper.labelEntityList(labelId);
+    }
+}

src/main/java/com/zzsn/thinktank/service/InfoSourceGroupMapService.java

@@ -2,6 +2,7 @@ package com.zzsn.thinktank.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zzsn.thinktank.entity.InfoSourceGroupMap;
+import com.zzsn.thinktank.vo.ThinkTankSourceVO;
 
 import java.util.List;
 
@@ -20,4 +21,13 @@ public interface InfoSourceGroupMapService extends IService<InfoSourceGroupMap>
     void unBind(String groupId, List<String> sourceIds);
 
     List<InfoSourceGroupMap> getSourceGroupMap(List groupIds);
+
+    /**
+     * 获取智库关联的信息源集合
+     *
+     * @param groupIds 智库id集合
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<ThinkTankSourceVO> listOfThinkTank(List<String> groupIds);
 }

src/main/java/com/zzsn/thinktank/service/ThinktankBasicInfoService.java

@@ -9,11 +9,12 @@ import com.zzsn.thinktank.vo.ThinktankBasicInfoListVo;
 import com.zzsn.thinktank.vo.ThinktankBasicInfoVo;
 import com.zzsn.thinktank.vo.ThinktankInfoVo;
 import org.springframework.web.multipart.MultipartFile;
+import com.zzsn.thinktank.vo.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.List;
 
 /**
  * @Version 1.0
@@ -43,12 +44,41 @@ public interface ThinktankBasicInfoService extends IService<ThinktankBasicInfo>
 
     void downloadTemplate(HttpServletResponse response);
 
-    Result batchImport(MultipartFile multipartFile);
-
-    byte[] batchExport(ThinktankBasicInfoListVo thinktankBasicInfoListVo, HttpServletRequest request, HttpServletResponse response);
-
     Result<?> getListBaseData(String id, Integer pageNo, Integer pageSize, Integer office);
 
+    /**
+     * 批量导入智库信息
+     *
+     * @param thinkTankImportVOList 智库信息列表
+     * @author lkg
+     * @date 2024/8/23
+     */
+    String batchImport(List<ThinkTankFileVO> thinkTankImportVOList);
+
+    /**
+     * 根据搜索条件获取导出列表
+     *
+     * @param id            智库id集合,多个逗号隔开
+     * @param codeId        主库编码
+     * @param typeId        国家id
+     * @param thinktankName 智库名称
+     * @param tagId         研究领域id
+     * @param keyword       关键词
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<ThinktankBasicInfo> exportListByCondition(String id, String codeId, String typeId,
+                                                   String thinktankName, String tagId, String keyword);
+
+    /**
+     * 智库采集量统计
+     *
+     * @param dataList 智库列表
+     * @author lkg
+     * @date 2024/8/23
+     */
+    List<ThinkTankSourceVO> thinkTankCollectCount(List<ThinktankBasicInfo> dataList);
+
     IPage<ThinktankBasicInfo> pageList(Integer pageNo,Integer pageSize,ThinktankBasicInfoListVo vo, HttpServletRequest req) throws Exception;
 
     List<Map<String,Object>> queryStatisticalAnalysis(String type,Page page, ThinktankBasicInfoListVo vo, HttpServletRequest req);

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

@@ -8,6 +8,7 @@ import com.zzsn.thinktank.entity.InfoSourceGroupMap;
 import com.zzsn.thinktank.entity.ThinktankBasicInfo;
 import com.zzsn.thinktank.mapper.InfoSourceGroupMapMapper;
 import com.zzsn.thinktank.service.InfoSourceGroupMapService;
+import com.zzsn.thinktank.vo.ThinkTankSourceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -68,4 +69,9 @@ public class InfoSourceGroupMapServiceImpl extends ServiceImpl<InfoSourceGroupMa
         return list;
     }
 
+    @Override
+    public List<ThinkTankSourceVO> listOfThinkTank(List<String> groupIds) {
+        return baseMapper.listOfThinkTank(groupIds);
+    }
+
 }

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

@@ -47,12 +47,14 @@ public class ThinktankTagServiceImpl extends ServiceImpl<ThinktankTagMapper, Lab
 
     @Value("${sys_base_label_type_id}")
     private String sys_base_label_type_id;
+    @Value("${sys_base_label_type}")
+    private String sys_base_label_type;
 
 
     @Override
     public Result<?> getTagList(String id, String name) {
         if(id == null || id.length() == 0){
-            id = sys_base_label_type_id;
+            id = sys_base_label_type;
         }
         List<SysBaseLabelType> endNodes = getEndNodes(id);
         List<String> ids = new ArrayList<>();

src/main/java/com/zzsn/thinktank/util/ExcelExportUtil.java

@@ -9,6 +9,7 @@ import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
@@ -209,13 +210,15 @@ public class ExcelExportUtil {
             return null;
         }
         // 获取第一行数据（假如第一行就是列名）
-        Row sheetTitleRow = sheet.getRow(sheet.getFirstRowNum());
+        Row sheetTitleRow = sheet.getRow(1);
         // 取出最后一列
         short lastCellNum = sheetTitleRow.getLastCellNum();
         List<String> sheetTitleList = new LinkedList<>();
         for (int i = 0; i < lastCellNum; i++) {
             // 取出每一列的名
-            String cellValue = sheetTitleRow.getCell(i).getStringCellValue();
+            Cell cell = sheetTitleRow.getCell(i);
+            HSSFDataFormatter dataFormatter = new HSSFDataFormatter();
+            String cellValue = dataFormatter.formatCellValue(cell);
             sheetTitleList.add(cellValue);
         }
         return sheetTitleList;

src/main/java/com/zzsn/thinktank/vo/DataChangeVO.java

+package com.zzsn.thinktank.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 批量导入时，数据转换实体
+ *
+ * @author lkg
+ * @date 2024/8/22
+ */
+@Setter
+@Getter
+public class DataChangeVO {
+
+    private String description;
+    private String value;
+}

src/main/java/com/zzsn/thinktank/vo/ThinkTankFileVO.java

+package com.zzsn.thinktank.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 智库导入模板对应实体
+ *
+ * @author lkg
+ * @date 2024/8/22
+ */
+@Setter
+@Getter
+public class ThinkTankFileVO {
+
+    //智库机构编码
+    private String codeId;
+    //中文全称
+    private String chineseWhole;
+    //中文简称
+    private String chineseSimple;
+    //英文全称
+    private String englishWhole;
+    //英文简称
+    private String englishSimple;
+    //官网
+    private String officialWebsite;
+    //所属国家/地区
+    private String belongCountry;
+    //语言
+    private String lang;
+    //运营状态
+    private String operateStatus;
+    //营利性质
+    private String profitNature;
+    //智库性质
+    private String nature;
+    //研究领域
+    private String tagName;
+    //影响力和地位
+    private String influencePosition;
+    //人员规模
+    private String staffSize;
+    //智库规模
+    private String scale;
+    //成果类型
+    private String achievementType;
+    //资金来源
+    private String fundsSource;
+    //原文全称
+    private String originalWhole;
+    //原文简称
+    private String originalSimple;
+    //简介
+    private String biographicalNotes;
+    //成立时间
+    private String establishTime;
+    //是否收费  1是 0否  默认为空值
+    private Integer charge;
+    //地址
+    private String address;
+    //创办单位/所属单位
+    private String belongUnit;
+
+}

src/main/java/com/zzsn/thinktank/vo/ThinkTankSourceVO.java

+package com.zzsn.thinktank.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ *
+ * @author lkg
+ * @date 2024/8/23
+ */
+@Setter
+@Getter
+public class ThinkTankSourceVO {
+
+    /**信息源组id*/
+    private String groupId;
+    //智库机构编码
+    private String codeId;
+    //中文全称
+    private String chineseWhole;
+    //关联信息源数量
+    private Integer infoSourceCount;
+    /**信息源id*/
+    private String sourceId;
+    //关联信息源编码
+    private String infoSourceCode;
+    //关联信息源名称
+    private String webSiteName;
+    //栏目名称
+    private String siteName;
+    //网址
+    private String siteUri;
+    //启用状态 1启用 0禁用
+    private String status;
+    /**信息源采集资讯数量**/
+    private Integer infoCount;
+    /**信息源进一个月的采集资讯数量**/
+    private Integer infoMonthlyCount;
+    /**智库下的资讯数量**/
+    private Integer groupCount;
+
+    public List<String> toList(){
+        List<String> list = new ArrayList<>();
+        list.add(getValue(groupId));
+        list.add(getValue(codeId));
+        list.add(getValue(chineseWhole));
+        if (infoSourceCount == null) {
+            list.add("");
+        } else {
+            list.add(String.valueOf(infoSourceCount));
+        }
+        if (groupCount == null) {
+            list.add("");
+        } else {
+            list.add(String.valueOf(groupCount));
+        }
+        list.add(getValue(infoSourceCode));
+        list.add(getValue(webSiteName));
+        list.add(getValue(siteName));
+        list.add(getValue(siteUri));
+        list.add(getValue(status));
+        if (infoCount == null) {
+            list.add("");
+        } else {
+            list.add(String.valueOf(infoCount));
+        }
+        if (infoMonthlyCount == null) {
+            list.add("");
+        } else {
+            list.add(String.valueOf(infoMonthlyCount));
+        }
+        return list;
+    }
+
+    private String getValue(String value){
+        if (StringUtils.isEmpty(value)) {
+            value = "";
+        }
+        return value;
+    }
+}

src/main/java/com/zzsn/thinktank/vo/ThinktankBasicInfoListVo.java

@@ -41,6 +41,8 @@ public class ThinktankBasicInfoListVo {
 
     //标签
     private String tagId;
+    //智库id，多个逗号隔开
+    private String id;
 
 
     //区域国家标签id

src/main/java/com/zzsn/thinktank/vo/ThinktankBasicInfoVo.java

@@ -82,4 +82,23 @@ public class ThinktankBasicInfoVo extends Model<ThinktankBasicInfoVo> {
   //绑定信息源个数
   private Integer infoSourceCount;
 
+  //语言
+  private String lang;
+  //运营状态
+  private String operateStatus;
+  //营利性质
+  private String profitNature;
+  //智库性质
+  private String nature;
+  //影响力和地位
+  private String influencePosition;;
+  //人员规模
+  private String staffSize;
+  //智库规模
+  private String scale;
+  //成果类型
+  private String achievementType;
+  //资金来源
+  private String fundsSource;
+
 }

src/main/resources/application.yml

@@ -45,6 +45,11 @@ es1:
   password: zzsn9988
 
 sys_base_label_type_id: 1783029731298439170
+sys_base_label_type: 1792195735429595138
+dict:
+  language: clb_language
+  think_tank_nature: think_tank_nature
+  think_tank_profit_nature: think_tank_profit_nature
 
 files:
   #storage: D:\\thinktank\\

src/main/resources/mapper/DataImportMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zzsn.thinktank.mapper.DataImportMapper">
+
+
+    <select id="dictItemList" resultType="com.zzsn.thinktank.vo.DataChangeVO">
+        select item.item_text as description,item.item_value as value
+        from clb_system.sys_dict_item item inner join clb_system.sys_dict dict on item.dict_id = dict.id
+        where dict.dict_code = #{dictCode}
+    </select>
+
+    <select id="labelEntityList" resultType="com.zzsn.thinktank.vo.DataChangeVO">
+        select entity.name as description,entity.id as value
+        from label_entity entity inner join sys_base_label_type_map map on map.relation_id = entity.id
+        where map.label_id = #{labelId}
+    </select>
+</mapper>
+
+
+        

src/main/resources/mapper/EnterpriseMapper.xml

@@ -30,9 +30,7 @@
 
 
     <select id="getListByName" resultType="com.zzsn.thinktank.entity.SysBaseEnterprise">
-        select * from sys_base_enterprise
-        where 1=1
-        and name = #{name}
+        select id,social_credit_code,name from sys_base_enterprise where name = #{name}
     </select>
 
 </mapper>

src/main/resources/mapper/InfoSourceGroupMapMapper.xml

@@ -20,4 +20,16 @@
 			</foreach>
 		</if>
 	</delete>
+
+	<select id="listOfThinkTank" resultType="com.zzsn.thinktank.vo.ThinkTankSourceVO">
+		select b.group_id,b.source_id,a.info_source_code,a.web_site_name,a.site_name,a.site_uri,a.status
+		from info_source a inner join thinktank_info_source_group_map b on a.id = b.source_id
+		where 1=1
+		<if test="groupIds != null and groupIds.size() > 0">
+			and b.group_id in
+			<foreach collection="groupIds" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/ThinktankBasicInfoMapper.xml

@@ -6,7 +6,11 @@
 
     <select id="getList" resultType="com.zzsn.thinktank.vo.ThinktankBasicInfoVo">
         select
-            id,code_id,chinese_whole,chinese_simple,english_whole,english_simple,original_whole,original_simple,official_website,tag_id,tag_name,establish_time,charge,country_within_external,belong_country_id,belong_country,region,address,belong_unit_code,belong_unit,head_sculpture,biographical_notes,attribute,status,create_by,create_time,update_by,update_time
+        id,code_id,chinese_whole,chinese_simple,english_whole,english_simple,
+        original_whole,original_simple,official_website,tag_id,tag_name,establish_time,charge,
+        country_within_external,belong_country_id,belong_country,region,address,
+        belong_unit_code,belong_unit,head_sculpture,biographical_notes,status,
+        lang,operate_status,profit_nature,nature,influence_position,staff_size,scale,achievement_type,funds_source
         from thinktank_basic_info a
         where 1 = 1
         <if test="codeId != null and codeId != ''">
@@ -25,13 +29,14 @@
         </if>
 
         <if test="keyword != null and keyword != ''">
-            AND CONCAT_WS(',',code_id,chinese_whole,chinese_simple,english_whole,english_simple,original_whole,original_simple,official_website,tag_name,country_within_external,belong_country,region,address,belong_unit_code,belong_unit,biographical_notes,attribute)
-                    like '%${keyword}%'
+            AND
+            CONCAT_WS(',',code_id,chinese_whole,chinese_simple,english_whole,english_simple,original_whole,original_simple,official_website,tag_name,country_within_external,belong_country,region,address,belong_unit_code,belong_unit,biographical_notes,attribute)
+            like '%${keyword}%'
         </if>
         <if test="order != null and order != ''">
             ORDER BY CONVERT (${column} USING gbk) ${order}
         </if>
-        limit  #{offset}, #{pageSize}
+        limit #{offset}, #{pageSize}
     </select>
 
     <select id="getCount" resultType="int">
@@ -54,7 +59,8 @@
             </foreach>
         </if>
         <if test="keyword != null and keyword != ''">
-            AND CONCAT_WS(',',code_id,chinese_whole,chinese_simple,english_whole,english_simple,original_whole,original_simple,official_website,tag_name,country_within_external,belong_country,region,address,belong_unit_code,belong_unit,biographical_notes,attribute)
+            AND
+            CONCAT_WS(',',code_id,chinese_whole,chinese_simple,english_whole,english_simple,original_whole,original_simple,official_website,tag_name,country_within_external,belong_country,region,address,belong_unit_code,belong_unit,biographical_notes,attribute)
             like '%${keyword}%'
         </if>
 
@@ -63,8 +69,10 @@
 
     <select id="getExportList" resultType="com.zzsn.thinktank.vo.ThinktankBasicInfoExportVo">
         select
-        a.id, a.code_id, a.chinese_whole, a.chinese_simple, a.english_whole, a.english_simple, a.original_whole, a.original_simple, a.official_website, a.belong_country, a.tag_name, a.biographical_notes, a.establish_time, a.charge, a.address, a.belong_unit,
-               c.id as infoSourceId, c.info_source_code, c.web_site_name, c.site_name, c.site_uri, c.status
+        a.id, a.code_id, a.chinese_whole, a.chinese_simple, a.english_whole, a.english_simple, a.original_whole,
+        a.original_simple, a.official_website, a.belong_country, a.tag_name, a.biographical_notes, a.establish_time,
+        a.charge, a.address, a.belong_unit,
+        c.id as infoSourceId, c.info_source_code, c.web_site_name, c.site_name, c.site_uri, c.status
         from thinktank_basic_info a
         LEFT JOIN thinktank_info_source_group_map b
         on a.id = b.group_id
@@ -87,7 +95,8 @@
         </if>
 
         <if test="keyword != null and keyword != ''">
-            AND CONCAT_WS(',',code_id,chinese_whole,chinese_simple,english_whole,english_simple,original_whole,original_simple,official_website,tag_name,country_within_external,belong_country,region,address,belong_unit_code,belong_unit,biographical_notes,attribute)
+            AND
+            CONCAT_WS(',',code_id,chinese_whole,chinese_simple,english_whole,english_simple,original_whole,original_simple,official_website,tag_name,country_within_external,belong_country,region,address,belong_unit_code,belong_unit,biographical_notes,attribute)
             like '%${keyword}%'
         </if>
         <if test="order != null and order != ''">
@@ -96,8 +105,42 @@
 
     </select>
 
+    <select id="exportListByCondition" resultType="com.zzsn.thinktank.entity.ThinktankBasicInfo">
+        select
+        a.id, a.code_id, a.chinese_whole, a.chinese_simple, a.english_whole, a.english_simple, a.original_whole,
+        a.original_simple, a.official_website, a.belong_country_id, a.tag_id, a.biographical_notes, a.establish_time,
+        a.charge, a.address, a.belong_unit_code,a.lang,a.operate_status,a.profit_nature,a.nature,a.influence_position,
+        a.staff_size,a.scale,a.achievement_type,a.funds_source
+        from thinktank_basic_info a
+        where 1 = 1
+        <if test="ids != null and ids.size() > 0">
+            AND a.id in
+            <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="codeId != null and codeId != ''">
+            AND a.code_id = #{codeId}
+        </if>
+        <if test="typeId != null and typeId != ''">
+            AND a.belong_country_id = #{typeId}
+        </if>
+        <if test="thinktankName != null and thinktankName != ''">
+            AND a.chinese_whole like '%${thinktankName}%'
+        </if>
+        <if test="tagId != null and tagId != ''">
+            <foreach item="item" index="index" collection="tagId.split(',')">
+                AND a.tag_id like '%${item}%'
+            </foreach>
+        </if>
 
-
+        <if test="keyword != null and keyword != ''">
+            AND
+            CONCAT_WS(',',code_id,chinese_whole,chinese_simple,english_whole,english_simple,original_whole,original_simple,official_website,tag_name,country_within_external,belong_country,region,address,belong_unit_code,belong_unit,biographical_notes,attribute)
+            like '%${keyword}%'
+        </if>
+        order by create_time desc
+    </select>
 </mapper>