桐庐高企一件事

ttc-app/src/main/java/cn/ubitech/ttc/controller/EntryController.java

@@ -163,7 +163,7 @@ public class EntryController {
     public ResultModel editBasicInfo(@RequestBody List<Object> basicInfos, String nodeId) {
         ResultModel resultModel = new ResultModel();
         try {
-            int edited = entryService.editBasicInfo(basicInfos, "320117400");
+            int edited = entryService.editBasicInfo(basicInfos, nodeId);
             // int edited = 0;
             if (edited > 0){
                 resultModel.setData(edited);

ttc-app/src/main/java/cn/ubitech/ttc/controller/ResourceChoiceController.java

@@ -1,6 +1,7 @@
 package cn.ubitech.ttc.controller;
 
 
+import cn.ubitech.ttc.entity.ResourceChoiceMore;
 import cn.ubitech.ttc.model.ResourceChoice.ResourceChoiceModel;
 import cn.ubitech.ttc.model.common.Constant;
 import cn.ubitech.ttc.model.common.ResultModel;
@@ -196,5 +197,23 @@ public class ResourceChoiceController {
         return resultModel;
     }
 
+    @GetMapping(value = "/choice/more/list/{nodeId}/{restype}")
+    @ApiOperation(value = "更多资源选择列表", notes = "更多资源选择列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nodeId", paramType = "path", dataType = "String", value = "节点id"),
+            @ApiImplicitParam(name = "restype", paramType = "path", dataType = "Integer", value = "资源库类型")
+    })
+    public ResultModel moreChoice(@PathVariable String nodeId, @PathVariable Integer restype) {
+        ResultModel resultModel = new ResultModel();
+        try {
+            resultModel.setData(resouceChoiceService.getResourceChoiceMoreList(nodeId, restype));
+        } catch (Exception e) {
+            resultModel.setCode(Constant.INTERFACE_STATUS_CODE_3351);
+            resultModel.setData(e.toString());
+        }
+        return resultModel;
+    }
+
+
 
 }

ttc-app/src/main/java/cn/ubitech/ttc/controller/ResourceController.java

@@ -29,6 +29,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.mock.web.MockMultipartFile;
@@ -113,18 +114,21 @@ public class ResourceController {
             @ApiImplicitParam(name = "category", paramType = "path", dataType = "String", value = "行业"),
             @ApiImplicitParam(name = "tracetype", paramType = "path", dataType = "int", value = "痕迹类型，2619是收藏"),
             @ApiImplicitParam(name = "labelName", paramType = "path", dataType = "String", value = "筛选条件"),
-            @ApiImplicitParam(name = "node", paramType = "path", dataType = "String", value = "节点信息")
+            @ApiImplicitParam(name = "node", paramType = "path", dataType = "String", value = "节点信息"),
+            @ApiImplicitParam(name = "morescreening", paramType = "path", dataType = "String", value = "更多筛选"),
+            @ApiImplicitParam(name = "potentiallibrary", paramType = "path", dataType = "int", value = "潜力库筛选,1:国高，2:省科小，3:雏鹰，4:市级研发中心，5:省级研发中心，6:省级研究院，7:飞地研发中心")
     })
     public ResultModel getResourcelist(@PathVariable String keyword, @PathVariable Integer pagenum, @PathVariable long userid,
                                        @PathVariable String sort, @PathVariable String groupid, @PathVariable Integer moduleid,
-                                       @PathVariable String category, @PathVariable Integer tracetype, @PathVariable String labelName, @PathVariable String node) {
+                                       @PathVariable String category, @PathVariable Integer tracetype, @PathVariable String labelName,
+                                       @PathVariable String node) {
         log.info("keyword:{},userid:{},sort:{},groupid:{},moduleid:{},category:{},tracetype:{},labelName:{},node:{}",keyword,userid,sort,groupid,moduleid,category,tracetype,
                           labelName,node);
         ResultModel resultModel = new ResultModel();
         try {
             if (moduleid != 0) {
                 resourceLibraryService.getResourceList(keyword, pagenum, userid, sort, groupid, moduleid,
-                        category, tracetype, labelName, resultModel, node);
+                        category, tracetype, labelName, resultModel, node, 1);
             }
             //含有“武进区科技创新创业联盟入驻企业”标签的企业列表
             if (groupid.equals("231") && moduleid == 0) {

ttc-app/src/main/resources/application.yml

@@ -1,14 +1,14 @@
 server:
-  port: 8080
-#  port: 8089
+#  port: 8080
+  port: 8089
   tomcat:
     max-connections: 30000
   connection-timeout: 3000000
 spring:
   profiles:
-#    active: dev
+    active: dev
 #    active: test
-    active: prod
+#    active: prod
   cache:
     ehcache:
       config: classpath:ehcache-config.xml

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyEyasMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyEyas;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-26 14:04
+ */
+@Component
+public interface CompanyEyasMapper extends BaseMapper<CompanyEyas> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyFeidiMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyFeidi;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-26 15:46
+ */
+@Component
+public interface CompanyFeidiMapper extends BaseMapper<CompanyFeidi> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyKunitakainfoMapper.java

@@ -0,0 +1,14 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyKunitakainfo;
+import cn.ubitech.ttc.entity.CompanyKunitakainfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-24 13:22
+ */
+@Component
+public interface CompanyKunitakainfoMapper extends BaseMapper<CompanyKunitakainfo> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyMunicipalResearchMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyMunicipalResearch;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-26 15:13
+ */
+@Component
+public interface CompanyMunicipalResearchMapper extends BaseMapper<CompanyMunicipalResearch> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyPatentInfoMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyPatentInfo;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-23 15:00
+ */
+@Component
+public interface CompanyPatentInfoMapper extends BaseMapper<CompanyPatentInfo> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyProvincialEmphasisMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyProvincialEmphasis;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-24 14:42
+ */
+@Component
+public interface CompanyProvincialEmphasisMapper extends BaseMapper<CompanyProvincialEmphasis> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyProvincialHighandnewMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyProvincialHighandnew;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-26 10:09
+ */
+@Component
+public interface CompanyProvincialHighandnewMapper extends BaseMapper<CompanyProvincialHighandnew> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyProvincialMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyProvincial;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-24 17:44
+ */
+@Component
+public interface CompanyProvincialMapper extends BaseMapper<CompanyProvincial> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/CompanyProvincialScienceSmallMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.CompanyProvincialScienceSmall;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-26 13:07
+ */
+@Component
+public interface CompanyProvincialScienceSmallMapper extends BaseMapper<CompanyProvincialScienceSmall> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/dao/ResourceChoiceMoreMapper.java

@@ -0,0 +1,13 @@
+package cn.ubitech.ttc.dao;
+
+import cn.ubitech.ttc.entity.ResourceChoiceMore;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lys
+ * @create 2021-09-30 16:38
+ */
+@Component
+public interface ResourceChoiceMoreMapper extends BaseMapper<ResourceChoiceMore> {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyEyas.java

@@ -0,0 +1,53 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author lys
+ * @create 2021-09-23 11:20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyEyas extends AuthorityModel<CompanyEyas> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Long companyid;
+
+    //是否雏鹰计划企业
+    private Integer iseyas;
+
+    //认定年份
+    @TableField(value = "recognizedate",fill = FieldFill.INSERT)
+    private Date recognizedate;
+
+    //节点id
+    private String node;
+
+    //创建时间
+    private Date createtime;
+
+    @TableField(exist = false)
+    private String tablename = "company_eyas";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyFeidi.java

@@ -0,0 +1,55 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 飞地研发中心信息
+ * @author lys
+ * @create 2021-09-23 11:32
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyFeidi extends AuthorityModel<CompanyFeidi> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Long companyid;
+
+    //是否在建飞地研发中心
+    private Integer isfeidi;
+
+    //飞地研发中心专职研发人员数
+    private Integer feidipeoplecount;
+
+    //飞地研发中心场地面积
+    private Double feidiarea;
+
+    //节点id
+    private String node;
+
+    //创建时间
+    private Date createtime;
+
+    @TableField(exist = false)
+    private String tablename = "company_feidi";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyKunitakainfo.java

@@ -0,0 +1,58 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 国高信息表
+ * @author lys
+ * @create 2021-09-23 10:36
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyKunitakainfo extends AuthorityModel<CompanyPatentInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Long companyid;
+
+    //是否国高
+    private Integer iskunitaka;
+
+    //高企证书号
+    private String highenterprisecode;
+
+    //高新领域代码
+    private String highandnewcode;
+
+    //节点id
+    private String node;
+
+    //创建时间
+    private Date createtime;
+
+    @TableField(exist = false)
+    private String tablename = "company_kunitakainfo";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+
+
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyMunicipalResearch.java

@@ -0,0 +1,58 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 市级企业研发中心信息
+ * @author lys
+ * @create 2021-09-26 15:01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class CompanyMunicipalResearch extends AuthorityModel<CompanyMunicipalResearch> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Long companyid;
+
+    //是否市级企业研发中心
+    private Integer ismunicipalresearch;
+
+    //认定年份
+    @TableField(value = "recognizedate",fill = FieldFill.INSERT)
+    private Date recognizedate;
+
+    //市级企业研发中心名称
+    private String researchname;
+
+    //节点id
+    private String node;
+
+    //创建时间
+    @TableField(value = "createtime",fill = FieldFill.INSERT)
+    private Date createtime;
+
+    @TableField(exist = false)
+    private String tablename = "company_municipal_research";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyPatentInfo.java

@@ -0,0 +1,62 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 专利信息
+ * @author lys
+ * @create 2021-09-23 14:47
+ */
+@Data
+@EqualsAndHashCode
+@Builder
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompanyPatentInfo extends AuthorityModel<CompanyPatentInfo> {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //资源信息id
+    private Long companyid;
+
+    //发明专利授权数
+    private Integer patentcount;
+
+    //实用新型授权数
+    private Integer patentforutilitycount;
+
+    //软件著作权数
+    private Integer patentforsoftwarecount;
+
+    //节点id
+    private String node;
+
+    //是否可用
+    private Integer isenabled;
+
+    //创建时间
+    private Date createtime;
+
+    //文件唯一标识
+    private String reqid;
+
+    @TableField(exist = false)
+    private String tablename = "company_patent_info";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyProvincial.java

@@ -0,0 +1,57 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 省级企业研究院
+ * @author lys
+ * @create 2021-09-23 11:06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyProvincial extends AuthorityModel<CompanyProvincial> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Long companyid;
+
+    //是否省级企业研究院
+    private Integer isprovincialenterprise;
+
+    //省级企业认定年份
+    @TableField(value = "recognizedate",fill = FieldFill.INSERT)
+    private Date recognizedate;
+
+    //省级企业研究院名称
+    private String provincialname;
+
+    //节点id
+    private String node;
+
+    //创建时间
+    private Date createtime;
+
+    @TableField(exist = false)
+    private String tablename = "company_provincial";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyProvincialEmphasis.java

@@ -0,0 +1,57 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 省级重点企业研究院信息表
+ * @author lys
+ * @create 2021-09-23 10:59
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyProvincialEmphasis extends AuthorityModel<CompanyProvincialEmphasis> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Long companyid;
+
+    //是否省级重点企业研究院
+    private Integer isemphasis;
+
+    //认定年份
+    @TableField(value = "recognizedate", fill = FieldFill.INSERT)
+    private Date recognizedate;
+
+    //省级重点企业研究院名称
+    private String emphasisname;
+
+    //节点id
+    private String node;
+
+    //创建时间
+    private Date createtime;
+
+    @TableField(exist = false)
+    private String tablename = "company_provincial_emphasis";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyProvincialHighandnew.java

@@ -0,0 +1,57 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 省（浙江）高新技术研究开发中心
+ * @author lys
+ * @create 2021-09-23 11:11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyProvincialHighandnew extends AuthorityModel<CompanyProvincialHighandnew> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Long companyid;
+
+    //是否省高新技术研究开发中心
+    private Integer isprovincialhighandnew;
+
+    //认定年份
+    @TableField(value = "recognizedate",fill = FieldFill.INSERT)
+    private Date recognizedate;
+
+    //省高新技术研究开发中心名称
+    private String highandnewname;
+
+    //节点id
+    private String node;
+
+    //创建时间
+    private Date createtime;
+
+    @TableField(exist = false)
+    private String tablename = "company_provincial_highandnew";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyProvincialScienceSmall.java

@@ -0,0 +1,53 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author lys
+ * @create 2021-09-23 11:16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CompanyProvincialScienceSmall extends AuthorityModel<CompanyProvincialScienceSmall> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Long companyid;
+
+    //是否省科小
+    private Integer isprovincesciencesmall;
+
+    //认定年份
+    @TableField(value = "recognitiondate",fill = FieldFill.INSERT)
+    private Date recognitiondate;
+
+    //节点id
+    private String node;
+
+    //创建时间
+    private Date createtime;
+
+    @TableField(exist = false)
+    private String tablename = "company_provincial_science_small";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/CompanyYearMultipleoptionsLk.java

@@ -72,6 +72,13 @@ public class CompanyYearMultipleoptionsLk extends AuthorityModel<CompanyYearMult
      * 配置项对应的值5
      */
     private String yvalue5;
+
+    //营业收入
+    private String yvalue6;
+
+    //允许研扣除的研发费用
+    private String yvalue7;
+
     /**
      * 是否可用：0-不可用，1-可用，2-已停用
      */

ttc-backen/src/main/java/cn/ubitech/ttc/entity/MunicipalEnterprise.java

@@ -0,0 +1,53 @@
+package cn.ubitech.ttc.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.FieldFill;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 市级研发中心信息
+ * @author lys
+ * @create 2021-09-23 11:26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MunicipalEnterprise {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    //企业id
+    private Integer orgid;
+
+    //资源id
+    private Integer resid;
+
+    //是否市级研发中心
+    private Integer ismunicipal;
+
+    //认定年份
+    @TableField(value = "recognizedate",fill = FieldFill.INSERT)
+    private Date recognizedate;
+
+    //市级研发中心名称
+    private String municipalname;
+
+    @TableField(exist = false)
+    private String tablename = "municipal_enterprise";
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    protected Serializable pkVal() {
+        return this.id;
+    }
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/OrganizationInfo.java

@@ -67,11 +67,11 @@ public class OrganizationInfo extends AuthorityModel<OrganizationInfo>  implemen
     /**
      * 财务联系人姓名
      */
-    private String financialContact;
+    private String financialcontact;
     /**
      * 财务联系人电话
      */
-    private String financialContactphone;
+    private String financialcontactphone;
     /**
      * 财务联系人email
      */
@@ -83,11 +83,11 @@ public class OrganizationInfo extends AuthorityModel<OrganizationInfo>  implemen
     /**
      * 技术负责人姓名
      */
-    private String technologyContact;
+    private String technologycontact;
     /**
      * 技术负责人手机
      */
-    private String technologyContactphone;
+    private String technologycontactphone;
     /**
      * 机构代码
      */
@@ -402,6 +402,90 @@ public class OrganizationInfo extends AuthorityModel<OrganizationInfo>  implemen
      */
     private String rdinstitutionname;
 
+    //经营状态
+    private String managestatus;
+    //实缴资金
+    private Float practicalcapital;
+    //纳税人识别号
+    private String taxpayercode;
+    //工商注册号
+    private String registercode;
+    //登记机关
+    private String registeroffice;
+    //经营期限
+    private Date operatingperiod;
+    //行政区划
+    private String administrativedivision;
+    //核准日期
+    private Date approvaltime;
+    //经营范围
+    private String businessscope;
+    //科技联络人
+    private String sciencecontact;
+    //科技联络人联系方式
+    private String sciencecontactphone;
+    //乡镇街道平台
+    private String townplatform;
+    //是否国高   0：否 1：是
+    private Integer iskunitaka;
+    //高企证书号
+    private String highenterprisecode;
+    //高新领域代码
+    private String highandnewcode;
+    //是否省级重点企业研究院
+    private Integer isprovincialemphasisenterprise;
+    //省级重点企业认定年份
+    private Date emphasisdate;
+    //省级重点企业研究院名称
+    private String emphasisname;
+    //是否省级企业研究院
+    private Integer isprovincialenterprise;
+    //省级企业认定年份
+    private Date provincialdate;
+    //省级企业研究院名称
+    private String provincialname;
+    //是否省高新技术研究开发中心（浙江）
+    private Integer ishighandnewenterprise;
+    //省高新技术研究院开发中心认定年份
+    private Date highandnewdate;
+    //省高新技术研究开发中心名称
+    private String highandnewname;
+    //是否省科小
+    private Integer isprovincesciencesmall;
+    //省科小认定时间
+    private Date provincesciencesmalldate;
+    //是否"杭州市"雏鹰计划企业
+    private Integer iseyasenterprise;
+    //雏鹰计划认定年份
+    private Date eyasdate;
+    //是否市级企业研发中心
+    private Integer ismunicipalresearch;
+    //市级企业研发中心认定年份
+    private Date municipalresearchdate;
+    //市级企业研发中心名称
+    private String municipalresearchname;
+    //是否飞地在建研发中心
+    private Integer isfeidienterprise;
+    //飞地研发中心专职研发人数
+    private Integer feidipeoplecount;
+    //飞地研发中心场地面积
+    private Double feidiarea;
+    //前三年营业收入
+    private Double threeyearsrevenue;
+    //前三年允许扣除的研发费用
+    private Double threeyeardeductexpenses;
+    //前两年营业收入
+    private Double twoyearrevenue;
+    //前两年允许扣除的研发费用
+    private Double twoyeardeductexpenses;
+    //前一年营业收入
+    private Double lastyearrevenue;
+    //前一年允许扣除的研发费用
+    private Double lastyeardeductexpenses;
+    //研发总监姓名
+    private String researchdirector;
+    //研发总监联系方式
+    private String researchdirectorphone;
 
     /**
      * 非机构表中字段，存放机构对应的标签信息

ttc-backen/src/main/java/cn/ubitech/ttc/entity/PageSetting.java

@@ -1,11 +1,14 @@
 package cn.ubitech.ttc.entity;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.enums.IdType;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import cn.ubitech.ttc.model.authority.AuthorityModel;
@@ -196,6 +199,8 @@ public class PageSetting  implements Serializable{
      * 新增字段。
      */
     private String show;
+    //是否选项下的隐藏项
+    private String hidden;
 
     /**
      * 表名

ttc-backen/src/main/java/cn/ubitech/ttc/entity/ResQualityLk.java

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.enums.IdType;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -17,6 +15,8 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class ResQualityLk {
 
     private static final long serialVersionUID = 1L;

ttc-backen/src/main/java/cn/ubitech/ttc/entity/ResourceChoice.java

@@ -34,6 +34,7 @@ public class ResourceChoice extends AuthorityModel<ResourceChoice> implements Se
     private String info;
     private String propertytoes;
     private String filtermodelproperty;
+    private String isenabled;
     /**
      * 表名
      */

ttc-backen/src/main/java/cn/ubitech/ttc/entity/ResourceChoiceMore.java

@@ -0,0 +1,44 @@
+package cn.ubitech.ttc.entity;
+
+import cn.ubitech.ttc.model.authority.AuthorityModel;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * @author lys
+ * @create 2021-09-30 13:35
+ */
+@Data
+@EqualsAndHashCode
+@Accessors(chain = true)
+public class ResourceChoiceMore extends AuthorityModel<ResourceChoiceMore> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String node;
+    private String restype;
+    private String type;
+    private String value;
+    private String info;
+    private String propertytoes;
+    private String filtermodelproperty;
+    private String isenabled;
+    private String choicetype;
+    private String content1;
+    private String content2;
+    private String content3;
+
+    @TableField(exist = false)
+    private String tablename = "resource_choice_more";
+    @TableField(exist = false)
+    private Integer tablecode;
+}

ttc-backen/src/main/java/cn/ubitech/ttc/entity/Resourcelibrary.java

@@ -539,6 +539,59 @@ public class Resourcelibrary extends AuthorityModel<Resourcelibrary> implements
      * 导入文件唯一表示id
      */
     private String reqId;
+
+    //经营状态
+    private String manageStatus;
+
+    //实缴资金
+    private Float practicalCapital;
+
+    //纳税人识别号
+    private String taxpayerCode;
+
+    //工商注册号
+    private String registerCode;
+
+    //登记机关
+    private String registerOffice;
+
+    //成立日期
+    private Date setuptime;
+
+    //经营期限
+    private Date operatingPeriod;
+
+    //行政区划
+    private String administrativeDivision;
+
+    //核准日期
+    private Date approvaltime;
+
+    //经营范围
+    private String businessScope;
+
+    //曾用名
+    private String formername;
+
+    //科技联络人
+    private String scienceContact;
+
+    //科技联络人联系方式
+    private String scienceContactphone;
+
+    //乡镇（街道）平台
+    private String townPlatform;
+
+    //上年度营业收入
+    private Double lastyearrevenue;
+
+    //上年度允许扣除的研发费用
+    private Double lastyeardeductexpenses;
+
+    //根据高企证书号获取高企认定年份
+    @TableField(exist = false)
+    private String highidentificationyear;
+
     /**
      * 表名
      */

ttc-backen/src/main/java/cn/ubitech/ttc/excel/entry/EnterpriseBasicInfoExcelDataListener.java

@@ -205,10 +205,10 @@ public class EnterpriseBasicInfoExcelDataListener extends AnalysisEventListener<
         }
 
 
-        if (!StringUtils.isEmpty(excelData.getHasregulationorgname()) && !excelData.getHasregulationorgname().equals("规上")){
-            js.put("hasregulationorg","是否规上项" + ExcelPatternMsgUtils.IS_ON_THE_GAUGE_MSG);
-            System.out.println("isOnTheGauge");
-        }
+        // if (!StringUtils.isEmpty(excelData.getHasregulationorgname()) && !excelData.getHasregulationorgname().equals("规上")){
+        //     js.put("hasregulationorg","是否规上项" + ExcelPatternMsgUtils.IS_ON_THE_GAUGE_MSG);
+        //     System.out.println("isOnTheGauge");
+        // }
         System.out.println(js.toJSONString());
         list.add(js);
         System.out.println("企业基本信息,listttt>" + JSON.toJSONString(list));

ttc-backen/src/main/java/cn/ubitech/ttc/model/ResourceChoice/ResourceChoiceMoreModel.java

@@ -0,0 +1,17 @@
+package cn.ubitech.ttc.model.ResourceChoice;
+
+import cn.ubitech.ttc.entity.ResourceChoiceMore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+/**
+ * @author lys
+ * @create 2021-10-09 18:26
+ */
+@Data
+public class ResourceChoiceMoreModel implements Serializable {
+    private String title;
+    private Object items;
+}

ttc-backen/src/main/java/cn/ubitech/ttc/model/common/Constant.java

@@ -462,6 +462,7 @@ public class Constant {
     public static final Integer YEAR_MULTIPLEOPTIONS_SETUP_6607 = 6607; // 累计成果转化合同金额
     public static final Integer YEAR_MULTIPLEOPTIONS_SETUP_6608 = 6608; // 累计技术合同登记额
     public static final Integer YEAR_MULTIPLEOPTIONS_SETUP_6609 = 6609; // 专利数量（发明、实用、外观）
+    public static final Integer YEAR_MULTIPLEOPTIONS_SETUP_6612 = 6612; // 税务数据（桐庐节点）
 
     /**
      * typeentry中的设定值

ttc-backen/src/main/java/cn/ubitech/ttc/model/common/ElasticSearchTTCModel.java

@@ -104,5 +104,20 @@ public class ElasticSearchTTCModel implements ILabelESInterface {
     private Integer proficiency;   //技术成熟度
     private String area;
 
+    //高企一件事所需字段
+    private String registrationdate;   //成立日期
+    private Double yesteryearrevenue;  //上年度营收（税务）
+    private Double yesteryeardeduct;   //上年度允许扣除研发费用
+    private Integer patentcount;   //发明专利数量
+
+    private Integer registrationyear;   //成立年限
+    private Integer patentforutilitycount;  //实用新型授权数
+    private Integer patentforsoftwarecount;   //软件著作权数
+    private Integer highidentificationdate;   //国高最新认定年份(只存年份)
+    private Double yearrevenue;  //年度营收
+    private Double deductexpenses;   //允许扣除的研发费用
+    private String highdomain;   //国高领域
+    private Integer feidipeoplecount;   //飞地研发中心专职人员数
+    private Double feidiarea;   //飞地研发中心场地面积
 
 }

ttc-backen/src/main/java/cn/ubitech/ttc/model/common/SearchFilterModel.java

@@ -102,6 +102,8 @@ public class SearchFilterModel {
 
 	private Integer filterpolicyLevel;  //政策级别
 	private String filterarea;  //区域
+	private String filterStreet;   //街道
+	private String filterdomain;   // 国高/高企八大领域
 
 
 }

ttc-backen/src/main/java/cn/ubitech/ttc/model/datatools/dataentry/ConnectioninfoModel.java

@@ -36,6 +36,7 @@ import java.util.Map;
  */
 @Data
 public class ConnectioninfoModel extends Connectioninfo implements Serializable{
+    private CompanyPatentInfo companyPatentInfo;
     private OrganizationInfo organizationInfo; //机构类别
     private UserModel userModel;
     private List<CompanyProductLk> productLkList;// 产品

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/common/FileImportServiceImpl.java

@@ -347,9 +347,9 @@ public class FileImportServiceImpl {
                                         break;
                                     case "财务联系人":
                                         String financialContact = POIWordUtil.processfirst(tableCells.get(i + 2).getText(), false);
-                                        org.setFinancialContact(financialContact);
+                                        org.setFinancialcontact(financialContact);
                                         String financialContactphone = POIWordUtil.processfirst(tableCells.get(i + 4).getText(), false);
-                                        org.setFinancialContactphone(financialContactphone);
+                                        org.setFinancialcontactphone(financialContactphone);
                                         if (i + 6 >= tableCells.size()) {
                                             continue;
                                         }
@@ -358,9 +358,9 @@ public class FileImportServiceImpl {
                                         break;
                                     case "技术负责人":
                                         String technologyContact = POIWordUtil.processfirst(tableCells.get(i + 2).getText(), false);
-                                        org.setTechnologyContact(technologyContact);
+                                        org.setTechnologycontact(technologyContact);
                                         String TechnologyContactphone = POIWordUtil.processfirst(tableCells.get(i + 4).getText(), false);
-                                        org.setTechnologyContactphone(TechnologyContactphone);
+                                        org.setTechnologycontactphone(TechnologyContactphone);
                                         if (i + 6 >= tableCells.size()) {
                                             continue;
                                         }

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/common/InfoPageServiceImpl.java

@@ -18,6 +18,7 @@ import cn.ubitech.ttc.service.impl.resource.ResourceServiceImpl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.client.Client;
@@ -284,7 +285,11 @@ public class InfoPageServiceImpl {
                         System.err.println("getTcname:" + JSON.toJSONString(getTcname));
                         Object tcname = getTcname.invoke(object);
                         System.err.println("tcname:" + JSON.toJSONString(tcname));
-                        i.setContent(tcname != null ? tcname.toString() : "");
+                        if (i.getId() == 7130) {   //针对桐庐节点是否规上做处理
+                            i.setContent(tcname != null ? (tcname.toString().equals("1") ? "是" : "否") : "");
+                        } else {
+                            i.setContent(tcname != null ? tcname.toString() : "");
+                        }
                         if (i.getDictionarytype() != Constant.ZERO && i.getContent().length() > Constant.ZERO) {//反查字典表，重置content的值
                             if (i.getDictionarytype() == 30137) {
                                 String content = i.getContent();
@@ -776,7 +781,10 @@ public class InfoPageServiceImpl {
         List<PageSetting> list_1 = new ArrayList<>();
         if (parentPageCode == 1000027) {
             list_1 = pageSettingMapper.selectList(new EntityWrapper<PageSetting>().eq("node", pagetemplate)
-                    .eq("parentpagecode", parentPageCode).eq("resparenttype", resparenttype).eq("isenabled", Constant.ONE).eq("resinnertype", innertype));
+                    .eq("parentpagecode", parentPageCode)
+                    .eq("resparenttype", resparenttype)
+                    .eq("isenabled", Constant.ONE)
+                    .eq("resinnertype", innertype));
         } else {
             list_1 = pageSettingMapper.selectList(new EntityWrapper<PageSetting>()
                     .eq("node", pagetemplate)
@@ -808,7 +816,8 @@ public class InfoPageServiceImpl {
     public List<InfoUnitModel> getInfoUnitList(String node, long pagecode, long restype, long innerttype) {
         List<InfoUnitModel> unitModelList = new ArrayList<>();
         List<PageSetting> list = new ArrayList<>();
-        List<PageSetting> list_1 = pageSettingMapper.selectList(new EntityWrapper<PageSetting>().eq("node", node)
+        List<PageSetting> list_1 = pageSettingMapper.selectList(new EntityWrapper<PageSetting>()
+                .eq("node", node)
                 .eq("pagecode", pagecode)
                 .eq("restype", restype)
                 .eq("resinnertype", innerttype)

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/datatools/DataEntryResourceImpl.java

@@ -5,6 +5,7 @@ import cn.ubitech.ttc.common.SnowflakeIdWorker;
 import cn.ubitech.ttc.common.Util;
 import cn.ubitech.ttc.dao.*;
 import cn.ubitech.ttc.entity.*;
+import cn.ubitech.ttc.entity.CompanyProvincialEmphasis;
 import cn.ubitech.ttc.excel.entry.PolicyBasicInfoExcelData;
 import cn.ubitech.ttc.excel.entry.PolicyBasicInfoExcelDataLishui;
 import cn.ubitech.ttc.model.common.Constant;
@@ -17,6 +18,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.mockito.internal.matchers.Or;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -85,6 +87,28 @@ public class DataEntryResourceImpl {
     private ActivityRecordMapper activityRecordMapper;
     @Autowired
     private ResourceSortLkMapper resourceSortLkMapper;
+    @Autowired
+    private CompanyPatentInfoMapper companyPatentInfoMapper;
+    @Autowired
+    private CompanyKunitakainfoMapper kunitakainfoMapper;
+    @Autowired
+    private CompanyProvincialEmphasisMapper provincialEmphasisMapper;
+    @Autowired
+    private CompanyProvincialMapper provincialMapper;
+    @Autowired
+    private CompanyProvincialHighandnewMapper provincialHighandnewMapper;
+    @Autowired
+    private CompanyProvincialScienceSmallMapper provincialScienceSmallMapper;
+    @Autowired
+    private CompanyEyasMapper companyEyasMapper;
+    @Autowired
+    private CompanyMunicipalResearchMapper municipalResearchMapper;
+    @Autowired
+    private CompanyFeidiMapper companyFeidiMapper;
+    @Autowired
+    private CompanyYearMultipleoptionsLkMapper yearMultipleoptionsLkMapper;
+    @Autowired
+    private YearMultipleoptionsSetupMapper yearMultipleoptionsSetupMapper;
 
     public static Map<String, Integer> ORG_SCALE_MAP = new HashMap<>();
 
@@ -506,6 +530,9 @@ public class DataEntryResourceImpl {
                 e.printStackTrace();
             }
         }
+        if (resourcelibrary.getRegistrationdate() != null) {
+            elasticSearchTTCModel.setRegistrationdate(simpleDateFormat.format(resourcelibrary.getRegistrationdate()));
+        }
         resourceRepository.save(elasticSearchTTCModel);
         log.info("save after:{}",JSON.toJSONString(elasticSearchTTCModel));
     }
@@ -579,7 +606,7 @@ public class DataEntryResourceImpl {
         resourcelibrary.setDevelopmentforbasecost(organizationInfo.getDevelopmentforbasecost() != null ? organizationInfo.getDevelopmentforbasecost() : Constant.ZERO);
         resourcelibrary.setLastyeartotalincome(organizationInfo.getLastyeartotalincome() != null ? organizationInfo.getLastyeartotalincome() : Constant.ZERO);
         resourcelibrary.setHasillegalactivities(organizationInfo.getHasillegalactivities() != null ? organizationInfo.getHasillegalactivities() : Constant.ZERO);
-        resourcelibrary.setPatentcount(organizationInfo.getPatentcount() != null ? organizationInfo.getPatentcount() : Constant.ZERO);
+        resourcelibrary.setPatentcount(organizationInfo.getPatentcount() != null ? organizationInfo.getPatentcount() : Constant.ZERO);     //发明专利数
         resourcelibrary.setPatentfornationalcount(organizationInfo.getPatentfornationalcount() != null ? organizationInfo.getPatentfornationalcount() : Constant.ZERO);
         resourcelibrary.setPatentfornewplantcount(organizationInfo.getPatentfornewplantcount() != null ? organizationInfo.getPatentfornewplantcount() : Constant.ZERO);
         resourcelibrary.setPatentforcropcount(organizationInfo.getPatentforcropcount() != null ? organizationInfo.getPatentforcropcount() : Constant.ZERO);
@@ -589,24 +616,42 @@ public class DataEntryResourceImpl {
         resourcelibrary.setPatentforintegratedcircuitcount(organizationInfo.getPatentforintegratedcircuitcount() != null ?
                 organizationInfo.getPatentforintegratedcircuitcount() : Constant.ZERO);
         resourcelibrary.setPatentforutilitycount(organizationInfo.getPatentforutilitycount() != null ?
-                organizationInfo.getPatentforutilitycount() : Constant.ZERO);
+                organizationInfo.getPatentforutilitycount() : Constant.ZERO);    //实用新型数
         resourcelibrary.setPatentfordesigncount(organizationInfo.getPatentfordesigncount() != null ? organizationInfo.getPatentfordesigncount() : Constant.ZERO);
-        resourcelibrary.setPatentforsoftwarecount(organizationInfo.getPatentforsoftwarecount() != null ? organizationInfo.getPatentforsoftwarecount() : Constant.ZERO);
+        resourcelibrary.setPatentforsoftwarecount(organizationInfo.getPatentforsoftwarecount() != null ? organizationInfo.getPatentforsoftwarecount() : Constant.ZERO);     //软件著作权叔
         resourcelibrary.setHastransformation(organizationInfo.getHastransformation() != null ? organizationInfo.getHastransformation() : Constant.ZERO);
         resourcelibrary.setHasthreestations(organizationInfo.getHasthreestations() != null ? organizationInfo.getHasthreestations() : Constant.ZERO);
         //新增溧水导入的一些字段
         resourcelibrary.setCooperation(organizationInfo.getCooperation() != null ? organizationInfo.getCooperation() : "");
         resourcelibrary.setCooperation1(organizationInfo.getCooperation1() != null ? organizationInfo.getCooperation1() : "");
         resourcelibrary.setContactemail(organizationInfo.getContactemail() != null ? organizationInfo.getContactemail() : "");
-        resourcelibrary.setFinancialContact(organizationInfo.getFinancialContact() != null ? organizationInfo.getFinancialContact() : "");
-        resourcelibrary.setFinancialContactphone(organizationInfo.getFinancialContactphone() != null ? organizationInfo.getFinancialContactphone() : "");
+        resourcelibrary.setFinancialContact(organizationInfo.getFinancialcontact() != null ? organizationInfo.getFinancialcontact() : "");
+        resourcelibrary.setFinancialContactphone(organizationInfo.getFinancialcontactphone() != null ? organizationInfo.getFinancialcontactphone() : "");
         resourcelibrary.setFinancialContactemail(organizationInfo.getFinancialContactemail() != null ? organizationInfo.getFinancialContactemail() : "");
-        resourcelibrary.setTechnologyContact(organizationInfo.getTechnologyContact() != null ? organizationInfo.getTechnologyContact() : "");
-        resourcelibrary.setTechnologyContactphone(organizationInfo.getTechnologyContactphone() != null ? organizationInfo.getTechnologyContactphone() : "");
+        resourcelibrary.setTechnologyContact(organizationInfo.getTechnologycontact() != null ? organizationInfo.getTechnologycontact() : "");
+        resourcelibrary.setTechnologyContactphone(organizationInfo.getTechnologycontactphone() != null ? organizationInfo.getTechnologycontactphone() : "");
         resourcelibrary.setTechnologyContactemail(organizationInfo.getTechnologyContactemail() != null ? organizationInfo.getTechnologyContactemail() : "");
         resourcelibrary.setTaxcode(organizationInfo.getTaxcode() != null ? organizationInfo.getTaxcode() : "");
         resourcelibrary.setComefrom(node);
-        // resourcelibrary.setPositionaltitles(organizationInfo.ge)
+
+        resourcelibrary.setManageStatus(organizationInfo.getManagestatus() != null ? organizationInfo.getManagestatus() : "");    //经营状态
+        resourcelibrary.setFormername(organizationInfo.getFormername() != null ? organizationInfo.getFormername() : "");    //曾用名
+        resourcelibrary.setPracticalCapital(organizationInfo.getPracticalcapital() != null ? organizationInfo.getPracticalcapital() : 0);   //实缴资金
+        resourcelibrary.setTaxpayerCode(organizationInfo.getTaxpayercode() != null ? organizationInfo.getTaxpayercode() : "");   //纳税人识别号
+        resourcelibrary.setRegisterCode(organizationInfo.getRegistercode() != null ? organizationInfo.getRegistercode() : "");   //工商注册号
+        resourcelibrary.setRegisterOffice(organizationInfo.getRegisteroffice() != null ? organizationInfo.getRegisteroffice() : "");   //注册机关
+        resourcelibrary.setSetuptime(organizationInfo.getRegistrationdate());    //注册时间
+        resourcelibrary.setOperatingPeriod(organizationInfo.getOperatingperiod());   //经营期限
+        resourcelibrary.setAdministrativeDivision(organizationInfo.getAdministrativedivision() != null ? organizationInfo.getAdministrativedivision() : "");  //行政区划
+        resourcelibrary.setApprovaltime(organizationInfo.getApprovaltime());   //核准日期
+        resourcelibrary.setBusinessScope(organizationInfo.getBusinessscope() != null ? organizationInfo.getBusinessscope() : "");   //经营范围
+        resourcelibrary.setScienceContact(organizationInfo.getSciencecontact() != null ? organizationInfo.getSciencecontact() : "");   //科技联络人
+        resourcelibrary.setScienceContactphone(organizationInfo.getSciencecontactphone() != null ? organizationInfo.getSciencecontactphone() : "");   //科技联络人联系方式
+        resourcelibrary.setTownPlatform(organizationInfo.getTownplatform() != null ? organizationInfo.getTownplatform() : "");     //乡镇（街道）平台
+        resourcelibrary.setHasregulationorg(organizationInfo.getHasregulationorg() != null ? (organizationInfo.getHasregulationorg() == 1 ? 10501 : 10502) : 10502);   //是否规上
+        resourcelibrary.setLastyearrevenue(organizationInfo.getLastyearrevenue() != null ? organizationInfo.getLastyearrevenue() : Constant.ZERO);    //上年度营业收入
+        resourcelibrary.setLastyeardeductexpenses(organizationInfo.getLastyeardeductexpenses() != null ? organizationInfo.getLastyeardeductexpenses() : Constant.ZERO);   //上年度允许扣除的研发费用
+        resourcelibrary.setHighidentificationyear(StringUtils.isNotEmpty(organizationInfo.getHighenterprisecode()) ? organizationInfo.getHighenterprisecode().substring(2,6) : "");
         return resourcelibrary;
     }
 
@@ -955,7 +1000,8 @@ public class DataEntryResourceImpl {
                 resourcelibrary.getScoretotal().toString() : "0"));
         elasticSearchTTCModel.setStatus(StringUtils.isBlank(resourcelibrary.getIshigh()) ? "" : resourcelibrary.getIshigh());
         elasticSearchTTCModel.setCapitalScale(resourcelibrary.getCapitalScale() == null ? 0f : resourcelibrary.getCapitalScale());
-        elasticSearchTTCModel.setAddress(resourcelibrary.getRegion());
+        // elasticSearchTTCModel.setAddress(resourcelibrary.getRegion());
+        elasticSearchTTCModel.setAddress(resourcelibrary.getAddress());
         elasticSearchTTCModel.setGroupid(claid);
         elasticSearchTTCModel.setCooperationmodel(resourcelibrary.getCooperationmodel() == null ? "" : resourcelibrary.getCooperationmodel());
         elasticSearchTTCModel.setPrimTag(resourcelibrary.getCategory());
@@ -981,6 +1027,13 @@ public class DataEntryResourceImpl {
         elasticSearchTTCModel.setLogo(resourcelibrary.getLogo() != null ? resourcelibrary.getLogo() : "");
         elasticSearchTTCModel.setSnowflakeID(String.valueOf(resourcelibrary.getSnowflakeid()));
         elasticSearchTTCModel.setUpdateTime(resourcelibrary.getCreatetime());
+        elasticSearchTTCModel.setPatentcount(resourcelibrary.getPatentcount());   //发明专利数量
+        elasticSearchTTCModel.setPatentforutilitycount(resourcelibrary.getPatentforutilitycount());   //实用新型数
+        elasticSearchTTCModel.setPatentforsoftwarecount(resourcelibrary.getPatentforsoftwarecount());   //软件著作权数
+        elasticSearchTTCModel.setYesteryearrevenue(resourcelibrary.getLastyearrevenue());   //上年度营业收入（做筛选时以最新更新的为准）
+        elasticSearchTTCModel.setYesteryeardeduct(resourcelibrary.getLastyeardeductexpenses());   //上年度允许扣除的研发费用（做筛选时以最新更新的为准）
+        elasticSearchTTCModel.setHighidentificationdate(Integer.valueOf(resourcelibrary.getHighidentificationyear()));   //国高最新认定年份
+
         return elasticSearchTTCModel;
     }
 
@@ -1189,4 +1242,280 @@ public class DataEntryResourceImpl {
         return "";
     }
 
+    public CompanyPatentInfo transferToCompanyPatentInfo(OrganizationInfo organizationInfo, String node) {
+        CompanyPatentInfo companyPatentInfo = new CompanyPatentInfo();
+        if (organizationInfo.getPatentcount() != null || organizationInfo.getPatentforutilitycount() != null || organizationInfo.getPatentforsoftwarecount() != null) {
+            companyPatentInfo.setCompanyid(organizationInfo.getId());
+            companyPatentInfo.setPatentcount(organizationInfo.getPatentcount() != null ? organizationInfo.getPatentcount() : 0);
+            companyPatentInfo.setPatentforutilitycount(organizationInfo.getPatentforutilitycount());
+            companyPatentInfo.setPatentforsoftwarecount(organizationInfo.getPatentforsoftwarecount());
+            companyPatentInfo.setNode(node);
+            companyPatentInfo.setIsenabled(Constant.ONE);
+        }
+        return companyPatentInfo;
+    }
+
+
+    public void insertCompanyPatentInfo(OrganizationInfo organizationInfo, String node) {
+        CompanyPatentInfo companyPatentInfo = transferToCompanyPatentInfo(organizationInfo, node);
+        List<CompanyPatentInfo> patentInfos = companyPatentInfoMapper.selectList(new EntityWrapper<CompanyPatentInfo>()
+                .eq("companyid", organizationInfo.getId())
+                .eq("node", node)
+                .eq("isenabled", Constant.ONE));
+        if (CollectionUtils.isEmpty(patentInfos) && companyPatentInfo != null && companyPatentInfo.getCompanyid() != null) {
+            companyPatentInfo.setCreatetime(new Date());
+            companyPatentInfoMapper.insert(companyPatentInfo);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public CompanyKunitakainfo transferToKunitakainfo(OrganizationInfo organizationInfo, String node) {
+        CompanyKunitakainfo kunitakainfo = new CompanyKunitakainfo();
+        if (organizationInfo.getIskunitaka() == 1) {
+            kunitakainfo.setCompanyid(organizationInfo.getId());
+            kunitakainfo.setIskunitaka(organizationInfo.getIskunitaka());
+            kunitakainfo.setHighenterprisecode(organizationInfo.getHighenterprisecode() != null ? organizationInfo.getHighenterprisecode() : "");
+            kunitakainfo.setHighandnewcode(organizationInfo.getHighandnewcode() != null ? organizationInfo.getHighandnewcode() : "");
+            kunitakainfo.setNode(node);
+        }
+        return kunitakainfo;
+    }
+
+    public void insertCompanyKunitakainfo(OrganizationInfo organizationInfo, String node) {
+        CompanyKunitakainfo kunitakainfo = transferToKunitakainfo(organizationInfo, node);
+        List<CompanyKunitakainfo> kunitakainfos = kunitakainfoMapper.selectList(new EntityWrapper<CompanyKunitakainfo>()
+                .eq("companyid", organizationInfo.getId())
+                .eq("iskunitaka", Constant.ONE)
+                .eq("node", node));
+        if (CollectionUtils.isEmpty(kunitakainfos) && kunitakainfo != null && kunitakainfo.getCompanyid() != null) {
+            kunitakainfo.setCreatetime(new Date());
+            kunitakainfoMapper.insert(kunitakainfo);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public void insertCompanyProvincialEmphasis(OrganizationInfo organizationInfo, String node) {
+        CompanyProvincialEmphasis companyProvincialEmphasis = transferToCompanyProvincialEmphasis(organizationInfo, node);
+        List<CompanyProvincialEmphasis> companyProvincialEmphases = provincialEmphasisMapper.selectList(new EntityWrapper<CompanyProvincialEmphasis>()
+                .eq("node", node)
+                .eq("companyid", organizationInfo.getId()));
+        if (companyProvincialEmphasis != null && CollectionUtils.isEmpty(companyProvincialEmphases) && companyProvincialEmphasis.getCompanyid() != null) {
+            companyProvincialEmphasis.setCreatetime(new Date());
+            provincialEmphasisMapper.insert(companyProvincialEmphasis);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public CompanyProvincialEmphasis transferToCompanyProvincialEmphasis(OrganizationInfo organizationInfo, String node) {
+        CompanyProvincialEmphasis companyProvincialEmphasis = new CompanyProvincialEmphasis();
+        if (organizationInfo.getIsprovincialemphasisenterprise() == 1) {
+            companyProvincialEmphasis.setCompanyid(organizationInfo.getId());
+            companyProvincialEmphasis.setIsemphasis(Constant.ONE);
+            companyProvincialEmphasis.setRecognizedate(organizationInfo.getEmphasisdate());
+            companyProvincialEmphasis.setEmphasisname(organizationInfo.getEmphasisname() != null ? organizationInfo.getEmphasisname() : "");
+            companyProvincialEmphasis.setNode(node);
+        }
+        return companyProvincialEmphasis;
+    }
+
+    public void insertCompanyProvincial(OrganizationInfo organizationInfo, String node) {
+        CompanyProvincial companyProvincial = transferToCompanyProvincial(organizationInfo, node);
+        List<CompanyProvincial> companyProvincials = provincialMapper.selectList(new EntityWrapper<CompanyProvincial>()
+                .eq("isprovincialenterprise", Constant.ONE)
+                .eq("companyid", organizationInfo.getId()));
+        if (CollectionUtils.isEmpty(companyProvincials) && companyProvincial != null && companyProvincial.getCompanyid() != null) {
+            companyProvincial.setCreatetime(new Date());
+            provincialMapper.insert(companyProvincial);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public CompanyProvincial transferToCompanyProvincial(OrganizationInfo organizationInfo, String node) {
+        CompanyProvincial companyProvincial = new CompanyProvincial();
+        if (organizationInfo.getIsprovincialenterprise() == 1) {
+            companyProvincial.setCompanyid(organizationInfo.getId());
+            companyProvincial.setIsprovincialenterprise(Constant.ONE);
+            companyProvincial.setRecognizedate(organizationInfo.getProvincialdate());
+            companyProvincial.setProvincialname(organizationInfo.getProvincialname());
+            companyProvincial.setNode(node);
+        }
+        return companyProvincial;
+    }
+
+    public void insertCompanyProvincialHighandnew(OrganizationInfo organizationInfo, String node) {
+        CompanyProvincialHighandnew companyProvincialHighandnew = transferToCompanyProvincialHighandnew(organizationInfo, node);
+        List<CompanyProvincialHighandnew> companyProvincialHighandnews = provincialHighandnewMapper.selectList(new EntityWrapper<CompanyProvincialHighandnew>()
+                .eq("companyid", organizationInfo.getId())
+                .eq("isprovincialhighandnew", Constant.ONE)
+                .eq("node", node));
+        if (CollectionUtils.isEmpty(companyProvincialHighandnews) && companyProvincialHighandnew != null && companyProvincialHighandnew.getCompanyid() != null) {
+            companyProvincialHighandnew.setCreatetime(new Date());
+            provincialHighandnewMapper.insert(companyProvincialHighandnew);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public CompanyProvincialHighandnew transferToCompanyProvincialHighandnew(OrganizationInfo organizationInfo, String node) {
+        CompanyProvincialHighandnew companyProvincialHighandnew = new CompanyProvincialHighandnew();
+
+        if (organizationInfo.getIshighandnewenterprise() == 1) {
+            companyProvincialHighandnew.setCompanyid(organizationInfo.getId());
+            companyProvincialHighandnew.setIsprovincialhighandnew(Constant.ONE);
+            companyProvincialHighandnew.setRecognizedate(organizationInfo.getHighandnewdate());
+            companyProvincialHighandnew.setHighandnewname(organizationInfo.getHighandnewname());
+            companyProvincialHighandnew.setNode(node);
+        }
+        return companyProvincialHighandnew;
+    }
+
+    public void insertCompanyProvincialScienceSmall(OrganizationInfo organizationInfo, String node) {
+        CompanyProvincialScienceSmall companyProvincialScienceSmall = transferToCompanyProvincialScienceSmall(organizationInfo, node);
+        List<CompanyProvincialScienceSmall> companyProvincialScienceSmalls = provincialScienceSmallMapper.selectList(new EntityWrapper<CompanyProvincialScienceSmall>()
+                .eq("companyid", organizationInfo.getId())
+                .eq("isprovincesciencesmall", Constant.ONE)
+                .eq("node", node));
+        if (CollectionUtils.isEmpty(companyProvincialScienceSmalls) && companyProvincialScienceSmall != null && companyProvincialScienceSmall.getCompanyid() != null) {
+            companyProvincialScienceSmall.setCreatetime(new Date());
+            provincialScienceSmallMapper.insert(companyProvincialScienceSmall);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public CompanyProvincialScienceSmall transferToCompanyProvincialScienceSmall(OrganizationInfo organizationInfo, String node) {
+        CompanyProvincialScienceSmall companyProvincialScienceSmall = new CompanyProvincialScienceSmall();
+        if (organizationInfo.getIsprovincesciencesmall() == 1) {
+            companyProvincialScienceSmall.setCompanyid(organizationInfo.getId());
+            companyProvincialScienceSmall.setIsprovincesciencesmall(Constant.ONE);
+            companyProvincialScienceSmall.setRecognitiondate(organizationInfo.getProvincesciencesmalldate());
+            companyProvincialScienceSmall.setNode(node);
+        }
+        return companyProvincialScienceSmall;
+    }
+
+    public void insertCompanyEyas(OrganizationInfo organizationInfo, String node) {
+        CompanyEyas companyEyas = transferToCompanyEyas(organizationInfo, node);
+        List<CompanyEyas> companyEyasList = companyEyasMapper.selectList(new EntityWrapper<CompanyEyas>()
+                .eq("companyid", organizationInfo.getId())
+                .eq("iseyas", Constant.ONE)
+                .eq("node", node));
+        if (CollectionUtils.isEmpty(companyEyasList) && companyEyas != null && companyEyas.getCompanyid() != null) {
+            companyEyas.setCreatetime(new Date());
+            companyEyasMapper.insert(companyEyas);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public CompanyEyas transferToCompanyEyas(OrganizationInfo organizationInfo, String node) {
+        CompanyEyas companyEyas = new CompanyEyas();
+        if (organizationInfo.getIseyasenterprise() == 1) {
+            companyEyas.setCompanyid(organizationInfo.getId());
+            companyEyas.setIseyas(Constant.ONE);
+            companyEyas.setRecognizedate(organizationInfo.getEyasdate());
+            companyEyas.setNode(node);
+        }
+        return companyEyas;
+    }
+
+    public void insertcompanymunicipalresearch(OrganizationInfo organizationInfo, String node) {
+        CompanyMunicipalResearch companyMunicipalResearch = transferToCompanyMunicipalResearch(organizationInfo, node);
+        List<CompanyMunicipalResearch> companyMunicipalResearches = municipalResearchMapper.selectList(new EntityWrapper<CompanyMunicipalResearch>()
+                .eq("companyid", organizationInfo.getId())
+                .eq("ismunicipalresearch", Constant.ONE));
+        if (CollectionUtils.isEmpty(companyMunicipalResearches) && companyMunicipalResearch != null && companyMunicipalResearch.getCompanyid() != null) {
+            companyMunicipalResearch.setCreatetime(new Date());
+            municipalResearchMapper.insert(companyMunicipalResearch);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public CompanyMunicipalResearch transferToCompanyMunicipalResearch(OrganizationInfo organizationInfo, String node) {
+        CompanyMunicipalResearch companyMunicipalResearch = new CompanyMunicipalResearch();
+        if (organizationInfo.getIsmunicipalresearch() == 1) {
+            companyMunicipalResearch.setCompanyid(organizationInfo.getId());
+            companyMunicipalResearch.setIsmunicipalresearch(Constant.ONE);
+            companyMunicipalResearch.setRecognizedate(organizationInfo.getMunicipalresearchdate());
+            companyMunicipalResearch.setResearchname(organizationInfo.getMunicipalresearchname());
+            companyMunicipalResearch.setNode(node);
+        }
+        return companyMunicipalResearch;
+    }
+
+    public void isnertcompanyfeidi(OrganizationInfo organizationInfo, String node) {
+        CompanyFeidi companyFeidi = transferToCompanyFei(organizationInfo, node);
+        List<CompanyFeidi> companyFeidis = companyFeidiMapper.selectList(new EntityWrapper<CompanyFeidi>()
+                .eq("companyid", organizationInfo.getId())
+                .eq("isfeidi", Constant.ONE)
+                .eq("node", node));
+        if (CollectionUtils.isEmpty(companyFeidis) && companyFeidi != null && companyFeidi.getCompanyid() != null) {
+            companyFeidi.setCreatetime(new Date());
+            companyFeidiMapper.insert(companyFeidi);
+        } else {
+            Util.IS_HAS_SAME_ORG = true;
+        }
+    }
+
+    public CompanyFeidi transferToCompanyFei(OrganizationInfo organizationInfo, String node) {
+        CompanyFeidi companyFeidi = new CompanyFeidi();
+        if (organizationInfo.getIsfeidienterprise() == 1) {
+            companyFeidi.setCompanyid(organizationInfo.getId());
+            companyFeidi.setIsfeidi(Constant.ONE);
+            companyFeidi.setFeidipeoplecount(organizationInfo.getFeidipeoplecount());
+            companyFeidi.setFeidiarea(organizationInfo.getFeidiarea());
+            companyFeidi.setNode(node);
+        }
+        return companyFeidi;
+    }
+
+    public void insertCompanyYearMultipleoptionsLk(OrganizationInfo organizationInfo, String node) {
+        if (organizationInfo.getThreeyearsrevenue() != null || organizationInfo.getThreeyeardeductexpenses() != null) {
+            CompanyYearMultipleoptionsLk yearMultipleoptionsLk = new CompanyYearMultipleoptionsLk();
+            yearMultipleoptionsLk.setCompanyid(organizationInfo.getId());
+            yearMultipleoptionsLk.setLinktype(30030);
+            yearMultipleoptionsLk.setYid(getYear().get(0).getId());
+            yearMultipleoptionsLk.setYvalue6(organizationInfo.getThreeyearsrevenue().toString());
+            yearMultipleoptionsLk.setYvalue7(organizationInfo.getThreeyeardeductexpenses().toString());
+            yearMultipleoptionsLk.setIsenabled(Constant.ONE);
+            yearMultipleoptionsLk.setIssave(Constant.ONE);
+            yearMultipleoptionsLkMapper.insert(yearMultipleoptionsLk);
+        }
+        if (organizationInfo.getTwoyearrevenue() != null || organizationInfo.getTwoyeardeductexpenses() != null) {
+            CompanyYearMultipleoptionsLk yearMultipleoptionsLk = new CompanyYearMultipleoptionsLk();
+            yearMultipleoptionsLk.setCompanyid(organizationInfo.getId());
+            yearMultipleoptionsLk.setLinktype(30030);
+            yearMultipleoptionsLk.setYid(getYear().get(1).getId());
+            yearMultipleoptionsLk.setYvalue6(organizationInfo.getTwoyearrevenue().toString());
+            yearMultipleoptionsLk.setYvalue7(organizationInfo.getTwoyeardeductexpenses().toString());
+            yearMultipleoptionsLk.setIsenabled(Constant.ONE);
+            yearMultipleoptionsLk.setIssave(Constant.ONE);
+            yearMultipleoptionsLkMapper.insert(yearMultipleoptionsLk);
+        }
+        if (organizationInfo.getLastyearrevenue() != null || organizationInfo.getLastyeardeductexpenses() != null) {
+            CompanyYearMultipleoptionsLk yearMultipleoptionsLk = new CompanyYearMultipleoptionsLk();
+            yearMultipleoptionsLk.setCompanyid(organizationInfo.getId());
+            yearMultipleoptionsLk.setLinktype(30030);
+            yearMultipleoptionsLk.setYid(getYear().get(2).getId());
+            yearMultipleoptionsLk.setYvalue6(organizationInfo.getLastyearrevenue().toString());
+            yearMultipleoptionsLk.setYvalue7(organizationInfo.getLastyeardeductexpenses().toString());
+            yearMultipleoptionsLk.setIsenabled(Constant.ONE);
+            yearMultipleoptionsLk.setIssave(Constant.ONE);
+            yearMultipleoptionsLkMapper.insert(yearMultipleoptionsLk);
+        }
+    }
+
+    public List<YearMultipleoptionsSetup> getYear() {
+        List<YearMultipleoptionsSetup> setuptype = yearMultipleoptionsSetupMapper.selectList(new EntityWrapper<YearMultipleoptionsSetup>()
+                .eq("setuptype", Constant.YEAR_MULTIPLEOPTIONS_SETUP_6612)
+                .orderBy("sort")
+                .last("desc"))
+                .subList(0,3);   //只截取前三个年份
+        return setuptype;
+    }
 }

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/datatools/ImgServiceImpl.java

@@ -302,7 +302,7 @@ public class ImgServiceImpl {
         SearchFilterModel searchFilterModel = new SearchFilterModel();
         searchFilterModel.setFilterModuleId(8);
         searchFilterModel.setFiltergroupid("1994");
-        Page<ElasticSearchTTCModel> resourcelist = searchService.getResourcelist(searchFilterModel, 0, 2000, new HashSet());
+        Page<ElasticSearchTTCModel> resourcelist = searchService.getResourcelist(searchFilterModel, 0, 2000, new HashSet(), null);
         List<ElasticSearchTTCModel> content = resourcelist.getContent();
         System.out.println("专家库专家数量：-------------》" + content.size());
         for (ElasticSearchTTCModel model : content) {

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/datatools/InterviewDataEntryServiceImpl.java

@@ -648,8 +648,7 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
                 insertSystemPicture(connectioninfoModel.getImages(), connectioninfoModel.getTablename(), user.getUserid(), connectioninfoModel.getId());
             }
             OrganizationInfo organizationInfo = connectioninfoModel.getOrganizationInfo();
-            if (organizationInfo != null && organizationInfo.getId() != null
-                    && organizationInfo.getId() != Constant.ZERO) {
+            if (organizationInfo != null && organizationInfo.getId() != null && organizationInfo.getId() != Constant.ZERO) {   //修改基本信息
                 update(organizationInfo, node, user.getUserid());
                 organizationInfo = organizationInfoMapper.selectById(organizationInfo.getId());//重新获取该机构，得到最完整的信息
                 ConnOrgLk connOrgLk = new ConnOrgLk();
@@ -764,6 +763,18 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
                     System.out.println("获取es库对应文件夹claid" + claid);
 
                     Resourcelibrary resourcelibrary = dataEntryResource.insertResourceLibrary(organizationInfo, claid, node);
+                    if ("330122000".equals(node)) {    //桐庐节点高企一件事录入相关
+                        dataEntryResource.insertCompanyPatentInfo(organizationInfo, node);       //专利信息
+                        dataEntryResource.insertCompanyKunitakainfo(organizationInfo, node);    //国高信息
+                        dataEntryResource.insertCompanyProvincialEmphasis(organizationInfo, node);   //省级重点企业研究院信息
+                        dataEntryResource.insertCompanyProvincial(organizationInfo, node);   //省级企业研究院信息
+                        dataEntryResource.insertCompanyProvincialHighandnew(organizationInfo, node);   //（浙江）省高新技术研究开发中心信息
+                        dataEntryResource.insertCompanyProvincialScienceSmall(organizationInfo, node);   //省科小信息
+                        dataEntryResource.insertCompanyEyas(organizationInfo, node);      //雏鹰计划
+                        dataEntryResource.insertcompanymunicipalresearch(organizationInfo, node);      //市级企业研发中心信息
+                        dataEntryResource.isnertcompanyfeidi(organizationInfo, node);    //飞地信息
+                        dataEntryResource.insertCompanyYearMultipleoptionsLk(organizationInfo,node);    //税务数据
+                    }
                     ResDtLk resDtLk_1 = new ResDtLk();
                     resDtLk_1.setResid(resourcelibrary.getId());
                     resDtLk_1.setConnid((long) Constant.ZERO);
@@ -2169,8 +2180,8 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
             }
         }
         pageModel.setTypecodemap(typecodemap);
-        log.info("thread***:{}", JSON.toJSONString(pageModel.getInfoSectionList()));
-        log.info("thread typecodemap***:{}", JSON.toJSONString(pageModel.getInfoSectionList().get(0).getTypecodemap()));
+        // log.info("thread***:{}", JSON.toJSONString(pageModel.getInfoSectionList()));
+        // log.info("thread typecodemap***:{}", JSON.toJSONString(pageModel.getInfoSectionList().get(0).getTypecodemap()));
 
         return pageModel;
     }
@@ -4564,17 +4575,17 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
                 // 老总电话？？？？？？
                 organizationInfo.setContactnum("联系电话");
                 // ？？？？？？？
-                organizationInfo.setFinancialContact("财务联系人姓名");
+                organizationInfo.setFinancialcontact("财务联系人姓名");
                 // ？？？？？？？？
-                organizationInfo.setFinancialContactphone("财务联系人电话");
+                organizationInfo.setFinancialcontactphone("财务联系人电话");
                 // ？？？？？？？？？？？？？
                 organizationInfo.setFinancialContactemail("财务联系人邮箱");
                 // 研发总监邮箱？？？？？
                 organizationInfo.setTechnologyContactemail("技术负责人邮箱");
                 // 研发总监姓名
-                organizationInfo.setTechnologyContact("技术负责人姓名");
+                organizationInfo.setTechnologycontact("技术负责人姓名");
                 // 研发总监姓名
-                organizationInfo.setTechnologyContactphone("技术负责人手机");
+                organizationInfo.setTechnologycontactphone("技术负责人手机");
                 // 统一社会信用代码
                 organizationInfo.setOrgcode("组织机构代码");
                 // ？？？？？？？？和纳税人识别号是否一样？
@@ -5263,17 +5274,17 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
                 // 老总电话？？？？？？
                 organizationInfo.setContactnum("联系电话");
                 // ？？？？？？？
-                organizationInfo.setFinancialContact("财务联系人姓名");
+                organizationInfo.setFinancialcontact("财务联系人姓名");
                 // ？？？？？？？？
-                organizationInfo.setFinancialContactphone("财务联系人电话");
+                organizationInfo.setFinancialcontactphone("财务联系人电话");
                 // ？？？？？？？？？？？？？
                 organizationInfo.setFinancialContactemail("财务联系人邮箱");
                 // 研发总监邮箱？？？？？
                 organizationInfo.setTechnologyContactemail("技术负责人邮箱");
                 // 研发总监姓名
-                organizationInfo.setTechnologyContact("技术负责人姓名");
+                organizationInfo.setTechnologycontact("技术负责人姓名");
                 // 研发总监姓名
-                organizationInfo.setTechnologyContactphone("技术负责人手机");
+                organizationInfo.setTechnologycontactphone("技术负责人手机");
                 // 统一社会信用代码
                 organizationInfo.setOrgcode("组织机构代码");
                 // ？？？？？？？？和纳税人识别号是否一样？
@@ -5630,17 +5641,17 @@ public class InterviewDataEntryServiceImpl implements IDataEntryService {
         // 老总电话？？？？？？todo 企业负责人联系方式
         organizationInfo.setContactnum("联系电话");
         // ？？？？？？？
-        organizationInfo.setFinancialContact("财务联系人姓名");
+        organizationInfo.setFinancialcontact("财务联系人姓名");
         // ？？？？？？？？
-        organizationInfo.setFinancialContactphone("财务联系人电话");
+        organizationInfo.setFinancialcontactphone("财务联系人电话");
         // ？？？？？？？？？？？？？
         organizationInfo.setFinancialContactemail("财务联系人邮箱");
         // 研发总监邮箱？？？？？
         organizationInfo.setTechnologyContactemail("技术负责人邮箱");
         // 研发总监姓名
-        organizationInfo.setTechnologyContact("技术负责人姓名");
+        organizationInfo.setTechnologycontact("技术负责人姓名");
         // 研发总监姓名
-        organizationInfo.setTechnologyContactphone("技术负责人手机");
+        organizationInfo.setTechnologycontactphone("技术负责人手机");
         // todo 统一社会信用代码 、???????
         organizationInfo.setOrgcode("组织机构代码");
         // ？？？？？？？？和纳税人识别号是否一样？????????????????

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/entry/EntryServiceImpl.java

@@ -169,6 +169,9 @@ public class EntryServiceImpl implements EntryService {
     @Autowired
     private ICompanyIurLkService companyIurLkService;
 
+    @Autowired
+    private ICompanyPatentInfoService companyPatentInfoService;
+
 
     /**
      * 获取可导入的文件类型列表.
@@ -388,8 +391,8 @@ public class EntryServiceImpl implements EntryService {
                 BeanUtils.copyProperties(excelData, info);
                 // todo 部分数据类型不同做一下转换
                 // string转long
-//            info.setRegistrationcapital(StringUtils.isNotEmpty(excelData.getRegistrationcapital()) ?
-//                    Long.valueOf(excelData.getRegistrationcapital()) : 0L);
+                info.setRegistrationcapital(StringUtils.isNotEmpty(excelData.getRegistrationcapital()) ?
+                        Long.valueOf(excelData.getRegistrationcapital()) : 0L);   //注册资金
                 info.setRegistrationdate(StringUtils.isNotEmpty(excelData.getRegistrationdate()) ?
                         DateUtils.stringToDate(excelData.getRegistrationdate()) : null);
                 info.setOrgtype(StringUtils.isNotEmpty(excelData.getOrgtypename()) ?
@@ -408,6 +411,10 @@ public class EntryServiceImpl implements EntryService {
                         Integer.valueOf(excelData.getPatentfordesigncount()) : 0);
                 info.setPatentforsoftwarecount(StringUtils.isNotEmpty(excelData.getPatentforsoftwarecount()) ?
                         Integer.valueOf(excelData.getPatentforsoftwarecount()) : 0);
+                info.setSciencecontact(StringUtils.isNotEmpty(excelData.getFinancialContact()) ? excelData.getFinancialContact() : "");  //科技联络人姓名
+                info.setSciencecontactphone(StringUtils.isNotEmpty(excelData.getFinancialContactphone()) ? excelData.getFinancialContactphone() : "");    //科技联络人联系方式
+                info.setResearchdirector(StringUtils.isNotEmpty(excelData.getTechnologyContact()) ? excelData.getTechnologyContact() : "");  //研发总监姓名
+                info.setResearchdirectorphone(StringUtils.isNotEmpty(excelData.getTechnologyContactphone()) ? excelData.getTechnologyContactphone() : "");  //研发总监联系方式
 
                 // info.setNodeId(nodeId);
                 // info.setReqId(reqId);
@@ -1260,6 +1267,10 @@ public class EntryServiceImpl implements EntryService {
                             changeRdinstitutiontype(Integer.valueOf(orginfo.getRdinstitutiontype().toString())));
                     excelData.setRegistrationdate(null != orginfo.getRegistrationdate() ? DateUtils.dateToString(orginfo.getRegistrationdate()) : null);
                     excelData.setRegistrationcapital(String.valueOf(orginfo.getRegistrationcapital()));
+                    excelData.setTechnologyContact(StringUtils.isNotEmpty(orginfo.getResearchdirector()) ? orginfo.getResearchdirector() : "");
+                    excelData.setTechnologyContactphone(StringUtils.isNotEmpty(orginfo.getResearchdirectorphone()) ? orginfo.getResearchdirectorphone() : "");
+                    excelData.setFinancialContact(StringUtils.isNotEmpty(orginfo.getSciencecontact()) ? orginfo.getSciencecontact() : "");
+                    excelData.setFinancialContactphone(StringUtils.isNotEmpty(orginfo.getSciencecontactphone()) ? orginfo.getSciencecontactphone() : "");
                     // excelData.setRdinstitutionname();
                     // 专利数量
                     excelData.setPatentcount(String.valueOf(orginfo.getPatentcount()));
@@ -2099,6 +2110,8 @@ public class EntryServiceImpl implements EntryService {
         List<List<ResQualityLk>> resQualityLks = new ArrayList<>();
         // 企业产品信息列表
         List<List<CompanyProductLk>> companyProductLks = new ArrayList<>();
+        //专利信息
+        List<CompanyPatentInfo> companyPatentInfos = new ArrayList<>();
         List<String> errors = new ArrayList<>();
         for (EnterpriseBasicInfoExcelData excelData : datas) {
             // JSONObject json = baseToOrgInfo(excelData,nodeId,errors);
@@ -2123,6 +2136,9 @@ public class EntryServiceImpl implements EntryService {
                 List<CompanyProductLk> initProducts = baseToProduct(info, excelData);
                 if (initProducts.size() > 0) companyProductLks.add(initProducts);
                 System.err.println("companyProductLks>>>>" + JSON.toJSONString(companyProductLks));
+                // 专利信息
+                CompanyPatentInfo companyPatentInfo = baseToPatentInfo(info, excelData, reqId);
+                if (companyPatentInfo != null) companyPatentInfos.add(companyPatentInfo);
             }
             // List<EnterpriseBasicInfo> areaIds = infos.stream().map(EnterpriseBasicInfo::getName).filter(x -> x.contains("企业名称") ).collect(Collectors.toList());
             // 过滤掉表头。
@@ -2156,6 +2172,13 @@ public class EntryServiceImpl implements EntryService {
                 companyProductLkService.insertBatch(companyProductLks.get(i));
             }
 
+            if (CollectionUtils.isNotEmpty(companyPatentInfos)) {
+                for (CompanyPatentInfo patentInfo : companyPatentInfos) {
+                    patentInfo.setCompanyid(infos.get(i).getId());
+                }
+                companyPatentInfoService.insertBatch(companyPatentInfos);
+            }
+
             // 初始化节点与公司关联列表。
             companyNodeLks.add(toCompanyNodeLk(infos.get(i), nodeId));
         }
@@ -4087,8 +4110,8 @@ public class EntryServiceImpl implements EntryService {
         BeanUtils.copyProperties(excelData, info);
         // todo 部分数据类型不同做一下转换
         // string转long
-//        info.setRegistrationcapital(StringUtils.isNotEmpty(excelData.getRegistrationcapital()) ?
-//                Long.valueOf(excelData.getRegistrationcapital()) : 0L);
+        info.setRegistrationcapital(StringUtils.isNotEmpty(excelData.getRegistrationcapital()) ?
+                Long.valueOf(excelData.getRegistrationcapital()) : 0L);
         info.setRegistrationdate(StringUtils.isNotEmpty(excelData.getRegistrationdate()) ?
                 DateUtils.stringToDate(excelData.getRegistrationdate()) : null);
         info.setOrgtype(StringUtils.isNotEmpty(excelData.getOrgtypename()) ?
@@ -4108,6 +4131,10 @@ public class EntryServiceImpl implements EntryService {
                 Integer.valueOf(excelData.getPatentfordesigncount()) : 0);
         info.setPatentforsoftwarecount(StringUtils.isNotEmpty(excelData.getPatentforsoftwarecount()) ?
                 Integer.valueOf(excelData.getPatentforsoftwarecount()) : 0);
+        info.setSciencecontact(StringUtils.isNotEmpty(excelData.getFinancialContact()) ? excelData.getFinancialContact() : "");  //科技联络人姓名
+        info.setSciencecontactphone(StringUtils.isNotEmpty(excelData.getFinancialContactphone()) ? excelData.getFinancialContactphone() : "");    //科技联络人联系方式
+        info.setResearchdirector(StringUtils.isNotEmpty(excelData.getTechnologyContact()) ? excelData.getTechnologyContact() : "");  //研发总监姓名
+        info.setResearchdirectorphone(StringUtils.isNotEmpty(excelData.getTechnologyContactphone()) ? excelData.getTechnologyContactphone() : "");  //研发总监联系方式
 
         // info.setNodeId(nodeId);
         // info.setReqId(reqId);
@@ -4186,24 +4213,52 @@ public class EntryServiceImpl implements EntryService {
     public List<ResQualityLk> baseToQualityList(OrganizationInfo info, EnterpriseBasicInfoExcelData excelData) {
         System.err.println("init quality list :" + excelData.getQualityOne());
         List<ResQualityLk> resQualityLks = new ArrayList<>();
-        String qualityOne = excelData.getQualityOne();
-        if (StringUtils.isNotEmpty(qualityOne) && null != qualityOne) {
-            qualityOne = qualityNameToType(excelData.getQualityOne());
-            ResQualityLk resQualityLkOne = new ResQualityLk(info.getId(), qualityOne, excelData.getInfoOne(),"1");
-            resQualityLks.add(resQualityLkOne);
-        }
-        String qualityTwo = excelData.getQualityTwo();
-        if (StringUtils.isNotEmpty(qualityTwo) && null != qualityTwo) {
-            qualityTwo = qualityNameToType(excelData.getQualityTwo());
-            ResQualityLk resQualityLkTwo = new ResQualityLk(info.getId(), qualityTwo, excelData.getInfoTwo(),"2");
-            resQualityLks.add(resQualityLkTwo);
-        }
-        String qualityThree = excelData.getQualityThree();
-        if (StringUtils.isNotEmpty(qualityThree) && null != qualityThree) {
-            qualityThree = qualityNameToType(excelData.getQualityThree());
-            ResQualityLk resQualityLkThree = new ResQualityLk(info.getId(), qualityThree, excelData.getInfoThree(),"3");
-            resQualityLks.add(resQualityLkThree);
-        }
+
+        ResQualityLk resQualityLkOne = ResQualityLk.builder()
+                .orgid(info.getId())
+                .quality(qualityNameToType(StringUtils.isNotEmpty(excelData.getQualityOne()) ? excelData.getQualityOne() : ""))
+                .info(excelData.getInfoOne())
+                .qualityflag("1")
+                .by1("")
+                .build();
+        resQualityLks.add(resQualityLkOne);
+
+        ResQualityLk resQualityLkTwo = ResQualityLk.builder()
+                .orgid(info.getId())
+                .quality(qualityNameToType(StringUtils.isNotEmpty(excelData.getQualityTwo()) ? excelData.getQualityTwo() : ""))
+                .info(excelData.getInfoTwo())
+                .qualityflag("2")
+                .by1("")
+                .build();
+        resQualityLks.add(resQualityLkTwo);
+
+        ResQualityLk resQualityLkThree = ResQualityLk.builder()
+                .orgid(info.getId())
+                .quality(qualityNameToType(StringUtils.isNotEmpty(excelData.getQualityThree()) ? excelData.getQualityThree() : ""))
+                .info(excelData.getInfoThree())
+                .qualityflag("3")
+                .by1("")
+                .build();
+        resQualityLks.add(resQualityLkThree);
+
+        // String qualityOne = excelData.getQualityOne();
+        // if (StringUtils.isNotEmpty(qualityOne) && null != qualityOne) {
+        //     qualityOne = qualityNameToType(excelData.getQualityOne());
+        //     ResQualityLk resQualityLkOne = new ResQualityLk(info.getId(), qualityOne, excelData.getInfoOne(),"1");
+        //     resQualityLks.add(resQualityLkOne);
+        // }
+        // String qualityTwo = excelData.getQualityTwo();
+        // if (StringUtils.isNotEmpty(qualityTwo) && null != qualityTwo) {
+        //     qualityTwo = qualityNameToType(excelData.getQualityTwo());
+        //     ResQualityLk resQualityLkTwo = new ResQualityLk(info.getId(), qualityTwo, excelData.getInfoTwo(),"2");
+        //     resQualityLks.add(resQualityLkTwo);
+        // }
+        // String qualityThree = excelData.getQualityThree();
+        // if (StringUtils.isNotEmpty(qualityThree) && null != qualityThree) {
+        //     qualityThree = qualityNameToType(excelData.getQualityThree());
+        //     ResQualityLk resQualityLkThree = new ResQualityLk(info.getId(), qualityThree, excelData.getInfoThree(),"3");
+        //     resQualityLks.add(resQualityLkThree);
+        // }
         System.err.println("resQualityLks:" + JSON.toJSONString(resQualityLks));
         return resQualityLks;
     }
@@ -4220,12 +4275,12 @@ public class EntryServiceImpl implements EntryService {
         // SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // Date updatetime = simpleDateFormat.parse(simpleDateFormat.format(new Date()));
         List<CompanyProductLk> companyProductLks = new ArrayList<>();
-        String productOne = excelData.getProductnameone();
-        if (StringUtils.isNotEmpty(productOne) && null != productOne) {
+        // String productOne = excelData.getProductnameone();
+        // if (StringUtils.isNotEmpty(productOne) && null != productOne) {
             CompanyProductLk productLkOne = CompanyProductLk.builder()
                     .companyid(info.getId())
                     .linktype(30030)
-                    .productname(productOne)
+                    .productname(StringUtils.isNotEmpty(excelData.getProductnameone()) ? excelData.getProductnameone() : "")
                     .productdescription("")
                     .libequipment("")
                     .isenabled(1)
@@ -4238,14 +4293,14 @@ public class EntryServiceImpl implements EntryService {
                     .productflag("1")
                     .build();
             companyProductLks.add(productLkOne);
-        }
+        // }
 
-        String productTwo = excelData.getProductnametwo();
-        if (StringUtils.isNotEmpty(productTwo) && null != productTwo) {
+        // String productTwo = excelData.getProductnametwo();
+        // if (StringUtils.isNotEmpty(productTwo) && null != productTwo) {
             CompanyProductLk productLkTwo = CompanyProductLk.builder()
                     .companyid(info.getId())
                     .linktype(30030)
-                    .productname(productTwo)
+                    .productname(StringUtils.isNotEmpty(excelData.getProductnametwo()) ? excelData.getProductnametwo() : "")
                     .productdescription("")
                     .libequipment("")
                     .isenabled(1)
@@ -4258,14 +4313,14 @@ public class EntryServiceImpl implements EntryService {
                     .productflag("2")
                     .build();
             companyProductLks.add(productLkTwo);
-        }
+        // }
 
-        String productThree = excelData.getProductnamethree();
-        if (StringUtils.isNotEmpty(productThree) && null != productThree) {
+        // String productThree = excelData.getProductnamethree();
+        // if (StringUtils.isNotEmpty(productThree) && null != productThree) {
             CompanyProductLk productLkThree = CompanyProductLk.builder()
                     .companyid(info.getId())
                     .linktype(30030)
-                    .productname(productThree)
+                    .productname(StringUtils.isNotEmpty(excelData.getProductnamethree()) ? excelData.getProductnamethree() : "")
                     .productdescription("")
                     .libequipment("")
                     .isenabled(1)
@@ -4278,13 +4333,26 @@ public class EntryServiceImpl implements EntryService {
                     .productflag("3")
                     .build();
             companyProductLks.add(productLkThree);
-        }
+        // }
 
 
         System.err.println("companyProductLks：" + JSON.toJSONString(companyProductLks));
         return companyProductLks;
     }
 
+    public CompanyPatentInfo baseToPatentInfo(OrganizationInfo info, EnterpriseBasicInfoExcelData excelData, String reqId) {
+        CompanyPatentInfo companyPatentInfo = CompanyPatentInfo.builder()
+                .companyid(info.getId())
+                .patentcount(excelData.getPatentcount() != null ? Integer.valueOf(excelData.getPatentcount()) : 0)
+                .patentforutilitycount(excelData.getPatentforutilitycount() != null ? Integer.valueOf(excelData.getPatentforutilitycount()) : 0)
+                .patentforsoftwarecount(excelData.getPatentforsoftwarecount() != null ? Integer.valueOf(excelData.getPatentforsoftwarecount()) : 0)
+                .node("330122000")
+                .isenabled(Constant.ONE)
+                .reqid(reqId)
+                .build();
+        return companyPatentInfo;
+    }
+
     //初始化主导产品信息（溧水节点）
     public List<CompanyProductLk> baseToProductLishui(OrganizationInfo info, EnterpriseBasicInfoExcelDataLishui excelData, String reqId) {
         List<CompanyProductLk> companyProductLks = new ArrayList<>();
@@ -4977,9 +5045,9 @@ public class EntryServiceImpl implements EntryService {
             case "8312":
                 newOrgType = "创新引领企业";
                 break;
-            case "8301":
-                newOrgType = "国家高新技术企业";
-                break;
+            // case "8301":
+            //     newOrgType = "国家高新技术企业";
+            //     break;
             case "8310":
                 newOrgType = "科技型初创企业";
                 break;
@@ -4989,9 +5057,9 @@ public class EntryServiceImpl implements EntryService {
             case "8307":
                 newOrgType = "其他企业";
                 break;
-            // case "8301":
-            //     newOrgType = "国高";
-            //     break;
+            case "8301":
+                newOrgType = "国高";
+                break;
             case "8308":
                 newOrgType = "市高";
                 break;

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/mybaits/CompanyPatentInfoServiceImpl.java

@@ -0,0 +1,15 @@
+package cn.ubitech.ttc.service.impl.mybaits;
+
+import cn.ubitech.ttc.dao.CompanyPatentInfoMapper;
+import cn.ubitech.ttc.entity.CompanyPatentInfo;
+import cn.ubitech.ttc.service.mybaits.ICompanyPatentInfoService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lys
+ * @create 2021-09-28 14:00
+ */
+@Service
+public class CompanyPatentInfoServiceImpl extends ServiceImpl<CompanyPatentInfoMapper, CompanyPatentInfo> implements ICompanyPatentInfoService {
+}

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/mybaits/SysUsersTaskInfoServiceImpl.java

@@ -458,7 +458,7 @@ public class SysUsersTaskInfoServiceImpl extends ServiceImpl<SysUsersTaskInfoMap
                 filterModel.setFiltergroupid(nodeClassificationLk.getClaid() + "");
                 filterModel.setUnique(uniqueStr);
                 filterModel.setSortKeys("unique,DESC");
-                pagelist = searchService.getResourcelist(filterModel, 0, pagesize, new HashSet<>());
+                pagelist = searchService.getResourcelist(filterModel, 0, pagesize, new HashSet<>(), null);
             }
             PageModel page = new PageModel();
 //        page.setTotalPage(null == pagelist ? 0 : pagelist.getTotalPages());

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/resource/ElasticSearchServiceImpl.java

@@ -4,13 +4,19 @@ import cn.ubitech.ttc.entity.ResourceChoice;
 import cn.ubitech.ttc.model.common.Constant;
 import cn.ubitech.ttc.model.common.SearchFilterModel;
 import com.alibaba.fastjson.JSON;
+import io.swagger.models.auth.In;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.index.query.*;
+import org.elasticsearch.script.Script;
+import org.elasticsearch.search.aggregations.AggregationBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.*;
 import org.elasticsearch.search.highlight.HighlightBuilder.Field;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Method;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -52,7 +58,7 @@ public class ElasticSearchServiceImpl {
      * @author chen.cong
      * @version 1.0, 2017年6月26日
      */
-    public QueryBuilder getQueryBuider(SearchFilterModel filterModel, Set<ResourceChoice> choiceSet) {
+    public QueryBuilder getQueryBuider(SearchFilterModel filterModel, Set<ResourceChoice> choiceSet, Integer potentiallibrary) {
         //查询精度,关键词符合20%即可查询出来
         String minimumShouldMatch = "20%";
         //初始化查询条件
@@ -82,10 +88,18 @@ public class ElasticSearchServiceImpl {
                     }*/
                         if (v.size() == 1) {
                             //与查询
-                            bqb.must(QueryBuilders.termQuery(l.getPropertytoes(), l.getValue().toLowerCase()));
+                            if (l.getType().equals("街道")) {    //桐庐节点街道标签专门处理
+                                bqb.must(QueryBuilders.matchPhraseQuery(l.getPropertytoes(), l.getValue().toLowerCase()));
+                            } else {
+                                bqb.must(QueryBuilders.termQuery(l.getPropertytoes(), l.getValue().toLowerCase()));
+                            }
                         } else {
                             //或查询
-                            bqb.should(QueryBuilders.termQuery(l.getPropertytoes(), l.getValue().toLowerCase()));
+                            if (l.getType().equals("街道")) {    //桐庐节点街道标签专门处理
+                                bqb.should(QueryBuilders.matchPhraseQuery(l.getPropertytoes(), l.getValue().toLowerCase()));
+                            } else {
+                                bqb.should(QueryBuilders.termQuery(l.getPropertytoes(), l.getValue().toLowerCase()));
+                            }
                         }
                     });
                 });
@@ -167,6 +181,9 @@ public class ElasticSearchServiceImpl {
         }
         // MultiMatchQueryBuilder builderSecond = new MultiMatchQueryBuilder(filterModel.getFilterKeyword(), "newtitle");
         // bqb.should(builderSecond);
+
+        //高企一件事潜力库删选
+        // potentiallibraryscreen(bqb, potentiallibrary);
         return bqb;
     }
 
@@ -344,4 +361,21 @@ public class ElasticSearchServiceImpl {
         return true;
     }
 
+    public void potentiallibraryscreen(BoolQueryBuilder bqb, Integer potentiallibrary) {
+        if (potentiallibrary == null) {
+            return;
+        } else {
+            switch (potentiallibrary) {
+                case Constant.ONE :   //潜力库国高筛选条件
+                    int i = Calendar.getInstance().get(Calendar.YEAR);
+                    Script script1 = new Script("doc['enterprisescale'].value - 1 > 3");   //发明专利>0
+                    Script script2 = new Script("doc['highidentificationdate'].value + 3 <=" + i);   //国高三年到期
+                    ScriptQueryBuilder scriptQueryBuilder1 = QueryBuilders.scriptQuery(script1);
+                    ScriptQueryBuilder scriptQueryBuilder2 = QueryBuilders.scriptQuery(script2);
+                    // bqb.must(scriptQueryBuilder1).must(scriptQueryBuilder2).should(QueryBuilders.termQuery());
+            }
+        }
+
+    }
+
 }

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/resource/ResourceLibraryServiceImpl.java

@@ -186,7 +186,8 @@ public class ResourceLibraryServiceImpl {
     }
 
     public void getResourceList(String keyword, Integer pagenum, long userid, String sort, String groupid, Integer moduleid,
-                                String category, Integer tracetype, String labelName, ResultModel resultModel, String node) {
+                                String category, Integer tracetype, String labelName, ResultModel resultModel, String node,
+                                Integer potentiallibrary) {
         if (moduleid == 3) {
             moduleid = 34;
         }
@@ -208,12 +209,12 @@ public class ResourceLibraryServiceImpl {
         org.springframework.data.domain.Page<ElasticSearchTTCModel> pagelist = null;
         //武进联盟活导师库，全查，通知公告库
         if (moduleid == 43 || moduleid == 44 || moduleid == 33) {
-            pagelist = searchService.getResourcelist(filterModel, pagenum, 6, choiceSet);
+            pagelist = searchService.getResourcelist(filterModel, pagenum, 6, choiceSet, null);
             if (pagelist.getTotalElements() > 0) {
-                pagelist = searchService.getResourcelist(filterModel, pagenum, Integer.valueOf(String.valueOf(pagelist.getTotalElements())), choiceSet);
+                pagelist = searchService.getResourcelist(filterModel, pagenum, Integer.valueOf(String.valueOf(pagelist.getTotalElements())), choiceSet, null);
             }
         } else {
-            pagelist = searchService.getResourcelist(filterModel, pagenum, 6, choiceSet);
+            pagelist = searchService.getResourcelist(filterModel, pagenum, 6, choiceSet, null);
         }
 
         PageModel page = new PageModel();
@@ -466,11 +467,11 @@ public class ResourceLibraryServiceImpl {
         org.springframework.data.domain.Page<ElasticSearchTTCModel> pagelist = null;
         //武进联盟活导师库，全查
         if (moduleid == 43 || moduleid == 44) {
-            pagelist = searchService.getResourcelist(filterModel, pagenum, 6, choiceSet);
-            pagelist = searchService.getResourcelist(filterModel, pagenum, Integer.valueOf(String.valueOf(pagelist.getTotalElements())), choiceSet);
+            pagelist = searchService.getResourcelist(filterModel, pagenum, 6, choiceSet, null);
+            pagelist = searchService.getResourcelist(filterModel, pagenum, Integer.valueOf(String.valueOf(pagelist.getTotalElements())), choiceSet, null);
         } else {
-            pagelist = searchService.getResourcelist(filterModel, pagenum, 6, choiceSet);
-            pagelist = searchService.getResourcelist(filterModel, pagenum, Integer.valueOf(String.valueOf(pagelist.getTotalElements())), choiceSet);
+            pagelist = searchService.getResourcelist(filterModel, pagenum, 6, choiceSet, null);
+            pagelist = searchService.getResourcelist(filterModel, pagenum, Integer.valueOf(String.valueOf(pagelist.getTotalElements())), choiceSet, null);
         }
 
         PageModel page = new PageModel();

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/resource/ResourceServiceImpl.java

@@ -145,6 +145,24 @@ public class ResourceServiceImpl implements IResourceService {
     private PageSettingMapper pageSettingMapper;
     @Autowired
     private ResourceclassrelationMapper resourceclassrelationMapper;
+    @Autowired
+    private CompanyPatentInfoMapper companyPatentInfoMapper;
+    @Autowired
+    private CompanyKunitakainfoMapper kunitakainfoMapper;
+    @Autowired
+    private CompanyProvincialEmphasisMapper provincialEmphasisMapper;
+    @Autowired
+    private CompanyProvincialMapper provincialMapper;
+    @Autowired
+    private CompanyProvincialHighandnewMapper provincialHighandnewMapper;
+    @Autowired
+    private CompanyProvincialScienceSmallMapper provincialScienceSmallMapper;
+    @Autowired
+    private CompanyEyasMapper companyEyasMapper;
+    @Autowired
+    private CompanyMunicipalResearchMapper municipalResearchMapper;
+    @Autowired
+    private CompanyFeidiMapper companyFeidiMapper;
 
 
     /**
@@ -683,6 +701,24 @@ public class ResourceServiceImpl implements IResourceService {
                 Thread th8 = new CompanyYearMultipleoptionsLkCompanyYearMultipleoptionsLk3Class(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
                 // 专利信息
                 Thread th9 = new CompanyResearchfindingLkIntellectualpropertyLkClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //专利信息（桐庐详情展示）
+                Thread th10 = new CompanyPatentInfoClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //国高信息（桐庐详情展示）
+                Thread th11 = new CompanyKunitakainfoClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //省级重点企业研究院信息
+                Thread th12 = new CompanyProvincialEmphasisClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //省级企业研究院信息
+                Thread th13 = new CompanyProvincialClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //省高新技术研究开发中心
+                Thread th14 = new CompanyProvincialHighandnewClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //省科小
+                Thread th15 = new CompanyProvincialScienceSmallClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //雏鹰计划企业
+                Thread th16 = new CompanyEyasClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //市级企业研发中心信息
+                Thread th17 = new CompanyMunicipalResearchClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
+                //飞地研发中心信息
+                Thread th18 = new CompanyFeidiClass(pageModel, resourcePageModel, typecodemap, userid, node, pagecode, pagetype, oid, resourcelibrary);
 
                 th1.start();
                 th2.start();
@@ -693,10 +729,22 @@ public class ResourceServiceImpl implements IResourceService {
                 th7.start();
                 th8.start();
                 th9.start();
+                th10.start();
+                th11.start();
+                th12.start();
+                th13.start();
+                th14.start();
+                th15.start();
+                th16.start();
+                th17.start();
+                th18.start();
                 while (iffinish) {
                     if (th1.getState().equals(Thread.State.TERMINATED) && th2.getState().equals(Thread.State.TERMINATED) && th3.getState().equals(Thread.State.TERMINATED)
                             && th4.getState().equals(Thread.State.TERMINATED) && th5.getState().equals(Thread.State.TERMINATED) && th6.getState().equals(Thread.State.TERMINATED)
-                            && th7.getState().equals(Thread.State.TERMINATED) && th8.getState().equals(Thread.State.TERMINATED) && th9.getState().equals(Thread.State.TERMINATED)) {
+                            && th7.getState().equals(Thread.State.TERMINATED) && th8.getState().equals(Thread.State.TERMINATED) && th9.getState().equals(Thread.State.TERMINATED)
+                            && th10.getState().equals(Thread.State.TERMINATED) && th11.getState().equals(Thread.State.TERMINATED) && th12.getState().equals(Thread.State.TERMINATED)
+                            && th13.getState().equals(Thread.State.TERMINATED) && th14.getState().equals(Thread.State.TERMINATED) && th15.getState().equals(Thread.State.TERMINATED)
+                            && th16.getState().equals(Thread.State.TERMINATED) && th17.getState().equals(Thread.State.TERMINATED) && th18.getState().equals(Thread.State.TERMINATED)) {
                         iffinish = false;
                         break;
                     }
@@ -2076,6 +2124,21 @@ public class ResourceServiceImpl implements IResourceService {
                 setCount(pageModel);
             }
             System.out.print(Thread.currentThread() + "==专利数量（发明、实用、外观）==" + (System.currentTimeMillis() - l2));
+            //税务数据
+            List<CompanyYearMultipleoptionsLk> taxationList = companyYearMultipleoptionsLkMapper.
+                    getCompanyYearMultipleoptionsLkByOrgid(Constant.YEAR_MULTIPLEOPTIONS_SETUP_6612, resourcelibrary.getOid(), 30030);
+            if (taxationList != null && taxationList.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyYearMultipleoptionsLk.class, node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6612);
+                for (CompanyYearMultipleoptionsLk t : taxationList) {
+                    commonService.getObjectAuthorityShowCode(t, userid, t.getYearsetupname(), node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6612, true);
+                    typecodemap = commonService.mapCombine(typecodemap, t.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(t.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
         }
 
     }
@@ -2286,6 +2349,311 @@ public class ResourceServiceImpl implements IResourceService {
         return resourceIndexList;
     }
 
+
+    @Data
+    @AllArgsConstructor
+    class CompanyPatentInfoClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run() {
+            List<CompanyPatentInfo> patentInfos = companyPatentInfoMapper.selectList(new EntityWrapper<CompanyPatentInfo>()
+                    .eq("companyid",resourcelibrary.getOid())
+                    .eq("isenabled",Constant.ONE));
+
+            if (patentInfos != null && patentInfos.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyPatentInfo.class, node, pagecode, pagetype, 0);
+                for (CompanyPatentInfo i : patentInfos) {
+                    commonService.getObjectAuthorityShowCode(i, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, i.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(i.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.print(Thread.currentThread() + "==专利信息==");
+        }
+    }
+
+
+    @Data
+    @AllArgsConstructor
+    class CompanyKunitakainfoClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run() {
+            List<CompanyKunitakainfo> kunitakainfos = kunitakainfoMapper.selectList(new EntityWrapper<CompanyKunitakainfo>()
+                    .eq("companyid", resourcelibrary.getOid())
+                    .eq("iskunitaka", Constant.ONE));
+            if (CollectionUtils.isNotEmpty(kunitakainfos) && kunitakainfos.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyKunitakainfo.class, node, pagecode, pagetype, 0);
+                for (CompanyKunitakainfo k : kunitakainfos) {
+                    commonService.getObjectAuthorityShowCode(k, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, k.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(k.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.println(Thread.currentThread() + "==国高信息==");
+        }
+    }
+
+    @Data
+    @AllArgsConstructor
+    class CompanyProvincialEmphasisClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run() {
+            List<CompanyProvincialEmphasis> companyProvincialEmphases = provincialEmphasisMapper.selectList(new EntityWrapper<CompanyProvincialEmphasis>()
+                    .eq("companyid", resourcelibrary.getOid())
+                    .eq("isemphasis", Constant.ONE));
+            if (CollectionUtils.isNotEmpty(companyProvincialEmphases) && companyProvincialEmphases.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyProvincialEmphasis.class, node, pagecode, pagetype, 0);
+                for (CompanyProvincialEmphasis p : companyProvincialEmphases) {
+                    commonService.getObjectAuthorityShowCode(p, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, p.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(p.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.println(Thread.currentThread() + "==省级重点企业研究院信息==");
+        }
+    }
+
+    @Data
+    @AllArgsConstructor
+    class CompanyProvincialClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run() {
+            List<CompanyProvincial> companyProvincials = provincialMapper.selectList(new EntityWrapper<CompanyProvincial>()
+                    .eq("companyid", resourcelibrary.getOid())
+                    .eq("isprovincialenterprise", Constant.ONE));
+            if (CollectionUtils.isNotEmpty(companyProvincials) && companyProvincials.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyProvincial.class, node, pagecode, pagetype, 0);
+                for (CompanyProvincial p : companyProvincials) {
+                    commonService.getObjectAuthorityShowCode(p, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, p.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(p.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.println(Thread.currentThread() + "==省级企业研究院信息==");
+        }
+    }
+
+    @Data
+    @AllArgsConstructor
+    class CompanyProvincialHighandnewClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run(){
+            List<CompanyProvincialHighandnew> companyProvincialHighandnews = provincialHighandnewMapper.selectList(new EntityWrapper<CompanyProvincialHighandnew>()
+                    .eq("companyid", resourcelibrary.getOid())
+                    .eq("isprovincialhighandnew", Constant.ONE));
+            if (CollectionUtils.isNotEmpty(companyProvincialHighandnews) && companyProvincialHighandnews.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyProvincialHighandnew.class, node, pagecode, pagetype, 0);
+                for (CompanyProvincialHighandnew p : companyProvincialHighandnews) {
+                    commonService.getObjectAuthorityShowCode(p, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, p.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(p.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.println(Thread.currentThread() + "==省高新技术研究开发中心信息==");
+        }
+    }
+
+    @Data
+    @AllArgsConstructor
+    class CompanyProvincialScienceSmallClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run(){
+            List<CompanyProvincialScienceSmall> companyProvincialScienceSmalls = provincialScienceSmallMapper.selectList(new EntityWrapper<CompanyProvincialScienceSmall>()
+                    .eq("companyid", resourcelibrary.getOid())
+                    .eq("isprovincesciencesmall", Constant.ONE)
+                    .eq("node", node));
+            if (CollectionUtils.isNotEmpty(companyProvincialScienceSmalls) && companyProvincialScienceSmalls.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyProvincialScienceSmall.class, node, pagecode, pagetype, 0);
+                for (CompanyProvincialScienceSmall p : companyProvincialScienceSmalls) {
+                    commonService.getObjectAuthorityShowCode(p, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, p.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(p.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.println(Thread.currentThread() + "==省科小信息==");
+        }
+    }
+
+    @Data
+    @AllArgsConstructor
+    class CompanyEyasClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run(){
+            List<CompanyEyas> companyEyas = companyEyasMapper.selectList(new EntityWrapper<CompanyEyas>()
+                    .eq("companyid", resourcelibrary.getOid())
+                    .eq("iseyas", Constant.ONE)
+                    .eq("node", node));
+            if (CollectionUtils.isNotEmpty(companyEyas) && companyEyas.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyEyas.class, node, pagecode, pagetype, 0);
+                for (CompanyEyas e : companyEyas) {
+                    commonService.getObjectAuthorityShowCode(e, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, e.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(e.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.println(Thread.currentThread() + "==雏鹰计划企业信息==");
+        }
+    }
+
+    @Data
+    @AllArgsConstructor
+    class CompanyMunicipalResearchClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run(){
+            List<CompanyMunicipalResearch> municipalResearches = municipalResearchMapper.selectList(new EntityWrapper<CompanyMunicipalResearch>()
+                    .eq("companyid", resourcelibrary.getOid())
+                    .eq("ismunicipalresearch", Constant.ONE)
+                    .eq("node", node));
+            if (CollectionUtils.isNotEmpty(municipalResearches) && municipalResearches.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyMunicipalResearch.class, node, pagecode, pagetype, 0);
+                for (CompanyMunicipalResearch m : municipalResearches) {
+                    commonService.getObjectAuthorityShowCode(m, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, m.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(m.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.println(Thread.currentThread() + "==市级企业研发中心信息==");
+        }
+    }
+
+    @Data
+    @AllArgsConstructor
+    class CompanyFeidiClass extends Thread {
+        public InfoPageModel pageModel;
+        ResourcePageModel resourcePageModel;
+        Map<Integer, List<AuthoritySetupModel>> typecodemap;
+        long userid;
+        String node;
+        Integer pagecode;
+        Integer pagetype;
+        Long[] oid;
+        Resourcelibrary resourcelibrary;
+
+        public void run(){
+            List<CompanyFeidi> companyFeidis = companyFeidiMapper.selectList(new EntityWrapper<CompanyFeidi>()
+                    .eq("companyid", resourcelibrary.getOid())
+                    .eq("isfeidi", Constant.ONE)
+                    .eq("node", node));
+            if (CollectionUtils.isNotEmpty(companyFeidis) && companyFeidis.size() > 0) {
+                List<InfoUnitModel> unitModelList = new ArrayList<>();
+                InfoSectionModel sectionModel = infoPageService.getResInfoSection(CompanyFeidi.class, node, pagecode, pagetype, 0);
+                for (CompanyFeidi f : companyFeidis) {
+                    commonService.getObjectAuthorityShowCode(f, userid, "", node, pagecode, pagetype, Constant.YEAR_MULTIPLEOPTIONS_SETUP_6607, true);
+                    typecodemap = commonService.mapCombine(typecodemap, f.getInfoSectionModel().getTypecodemap());
+                    unitModelList.addAll(f.getInfoSectionModel().getUnitlist());
+                }
+                sectionModel.setUnitlist(unitModelList);
+                pageModel.getInfoSectionList().add(sectionModel);
+                setCount(pageModel);
+            }
+            System.out.println(Thread.currentThread() + "==飞地研发中心信息==");
+        }
+    }
+
+
 //    public void  setAchievementHandle() {
 //        List<Resourcelibrary> avhieveList = resourcelibraryMapper.selectList(new EntityWrapper<Resourcelibrary>().eq("restype", 2));
 //        avhieveList.forEach(l -> {

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/resourceChoice/ResouceChoiceServiceImpl.java

@@ -5,9 +5,12 @@ import cn.ubitech.ttc.common.RedisHelper;
 import cn.ubitech.ttc.common.Util;
 import cn.ubitech.ttc.dao.*;
 import cn.ubitech.ttc.entity.ResourceChoice;
+import cn.ubitech.ttc.entity.ResourceChoiceMore;
 import cn.ubitech.ttc.entity.ResourceSort;
 import cn.ubitech.ttc.entity.ResourceSortLk;
 import cn.ubitech.ttc.model.ResourceChoice.ResourceChoiceModel;
+import cn.ubitech.ttc.model.ResourceChoice.ResourceChoiceMoreModel;
+import cn.ubitech.ttc.model.common.Constant;
 import cn.ubitech.ttc.model.common.ElasticSearchTTCModel;
 import cn.ubitech.ttc.model.common.ResultModel;
 import cn.ubitech.ttc.model.common.SearchFilterModel;
@@ -15,6 +18,7 @@ import cn.ubitech.ttc.model.label.LabelModel;
 import cn.ubitech.ttc.service.impl.search.SearchServiceImpl;
 import cn.ubitech.ttc.service.impl.user.SysUsersInfoServiceImpl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -105,6 +109,8 @@ public class ResouceChoiceServiceImpl {
     private ResourceSortLkMapper resourceSortLkMapper;
     @Autowired
     private LabelIntelligentCommonInfoMapper labelIntelligentCommonInfoMapper;
+    @Autowired
+    private ResourceChoiceMoreMapper choiceMoreMapper;
 
     /**
      * 获取资源筛选条件列表
@@ -120,7 +126,8 @@ public class ResouceChoiceServiceImpl {
 
         List<ResourceChoice> resourceChoiceList = resourceChoiceMapper.selectList(new EntityWrapper<ResourceChoice>()
                 .eq("node", node)
-                .eq("restype", restype).orderBy("id"));
+                .eq("restype", restype).orderBy("id")
+                .eq("isenabled",Constant.ONE));
         Map<String, List<ResourceChoice>> resourceChoiceMap = resourceChoiceList.stream().collect(Collectors.groupingBy(ResourceChoice::getType));
 
         resourceChoiceMap.forEach((k, v) -> {
@@ -160,7 +167,7 @@ public class ResouceChoiceServiceImpl {
         List<ElasticSearchTTCModel> sumList = new ArrayList<>();
 
         for (int i = 0; i < pagelist.getTotalPages(); i++) {
-            Page<ElasticSearchTTCModel> list = searchService.getResourcelist(filterModel, i, pagelist.getTotalPages(), new HashSet<>());
+            Page<ElasticSearchTTCModel> list = searchService.getResourcelist(filterModel, i, pagelist.getTotalPages(), new HashSet<>(), null);
             list.forEach(l -> {
                 sumList.add(l);
             });
@@ -324,6 +331,47 @@ public class ResouceChoiceServiceImpl {
         return isTopResourceFlag;
     }
 
+    public List<ResourceChoiceMoreModel> getResourceChoiceMoreList(String nodeId, Integer restype) {
+        log.info("nodeId:{},restype:{}",nodeId,restype);
+        List<ResourceChoiceMore> resourceChoiceMores = choiceMoreMapper.selectList(new EntityWrapper<ResourceChoiceMore>()
+                .eq("node",nodeId)
+                .eq("restype",restype)
+                .eq("isenabled",Constant.ONE));
+        Map<String, List<ResourceChoiceMore>> resourceChoiceMap = resourceChoiceMores.stream().collect(Collectors.groupingBy(ResourceChoiceMore::getType));
+        List<ResourceChoiceMoreModel> list = new ArrayList<>();
+        resourceChoiceMap.forEach((k,v) -> {
+            if (k.equals("国高八大领域")) {
+                ResourceChoiceMoreModel resourceChoiceMoreModel = new ResourceChoiceMoreModel();
+                resourceChoiceMoreModel.setTitle(k);
+                resourceChoiceMoreModel.setItems(v);
+                list.add(resourceChoiceMoreModel);
+            } else {
+                ResourceChoiceMoreModel resourceChoiceMoreModel = new ResourceChoiceMoreModel();
+                resourceChoiceMoreModel.setTitle(k);
+                resourceChoiceMoreModel.setItems(v.get(0));
+                list.add(resourceChoiceMoreModel);
+            }
+
+        });
+
+        // List<Map<String,Object>> list = new ArrayList();
+        // List<ResourceChoiceMore> list1 = new ArrayList();
+        // for (ResourceChoiceMore choiceMore : resourceChoiceMores) {
+        //     Map<String, Object> map = new HashMap();
+        //     if ("国高八大领域".equals(choiceMore.getType())) {
+        //         list1.add(choiceMore);
+        //     } else {
+        //         map.put("title",choiceMore.getInfo());
+        //     }
+        //     list.add(map);
+        // }
+        // Map<String,Object> map1 = new HashMap();
+        // map1.put("title","国高八大领域");
+        // map1.put("item",list1);
+        // list.add(map1);
+        return list;
+    }
+
     /**
      * 判断该条资源是否已置顶成功的线程
      */

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/search/SearchServiceImpl.java

@@ -192,7 +192,7 @@ public class SearchServiceImpl {
             SearchFilterModel filterModel = new SearchFilterModel();
             filterModel.setFilterKeyword(keyword);
             org.springframework.data.domain.Page<ElasticSearchTTCModel> resourcelist =
-                    searchService.getResourcelist(filterModel, pageModel.getCurrentPage() - Constant.ONE, 6, new HashSet<>());
+                    searchService.getResourcelist(filterModel, pageModel.getCurrentPage() - Constant.ONE, 6, new HashSet<>(), 0);
             pageModel.setTotalCount(resourcelist.getTotalElements());
             pageModel.setTotalPage(resourcelist.getTotalPages());
             List<ElasticSearchTTCModel> list = resourcelist.getContent();
@@ -231,11 +231,12 @@ public class SearchServiceImpl {
      * @param pagenum     页数
      * @return
      */
-    public org.springframework.data.domain.Page<ElasticSearchTTCModel> getResourcelist(SearchFilterModel filterModel, Integer pagenum, Integer pageSize, Set<ResourceChoice> choiceSet) {
+    public org.springframework.data.domain.Page<ElasticSearchTTCModel> getResourcelist(SearchFilterModel filterModel,
+                               Integer pagenum, Integer pageSize, Set<ResourceChoice> choiceSet, Integer potentiallibrary) {
         //构建查询
         NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
         //搜索条件
-        QueryBuilder qb = esServiceImpl.getQueryBuider(filterModel, choiceSet);
+        QueryBuilder qb = esServiceImpl.getQueryBuider(filterModel, choiceSet, potentiallibrary);
         System.out.println("qbqbqb:" + JSON.toJSONString(qb));
         nativeSearchQueryBuilder.withQuery(qb);
         //分页
@@ -375,4 +376,17 @@ public class SearchServiceImpl {
     //     bqb.must(QueryBuilders.termQuery("backup", resourceId));
     //
     // }
+
+    public List<ElasticSearchTTCModel> removePotentiallibrary(Integer potentiallibrary, List<ElasticSearchTTCModel> list) {
+        List<ElasticSearchTTCModel> lists = new ArrayList<>(list);
+        if (potentiallibrary == Constant.ONE && lists.size() > 0) {
+            for (int i = 0; i < lists.size(); i++) {
+                if (lists.get(i).getPatentcount() == null || lists.get(i).getPatentcount() < 0) {
+                    lists.remove(i);
+                    i--;
+                }
+            }
+        }
+        return lists;
+    }
 }

ttc-backen/src/main/java/cn/ubitech/ttc/service/impl/user/UserServiceImpl.java

@@ -690,7 +690,7 @@ public class UserServiceImpl implements IUserService {
             filterModel.setFilterCategory1Name("");
             UserHomeResourceModel model = new UserHomeResourceModel();
             if (pageSize != 0) {
-                Page<ElasticSearchTTCModel> pagelist = searchService.getResourcelist(filterModel, 0, pageSize, new HashSet<>());
+                Page<ElasticSearchTTCModel> pagelist = searchService.getResourcelist(filterModel, 0, pageSize, new HashSet<>(), null);
                 List<ElasticSearchTTCModel> list = pagelist.getContent();
                 model = setUserHomeResourceModel(info, "resourceCommonDetailsPage", list, true);
             }

ttc-backen/src/main/java/cn/ubitech/ttc/service/mybaits/ICompanyPatentInfoService.java

@@ -0,0 +1,11 @@
+package cn.ubitech.ttc.service.mybaits;
+
+import cn.ubitech.ttc.entity.CompanyPatentInfo;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * @author lys
+ * @create 2021-09-28 13:57
+ */
+public interface ICompanyPatentInfoService extends IService<CompanyPatentInfo> {
+}