Преглед на файлове

1、修改id自增属性。

guanzi преди 3 години
родител
ревизия
c060e7d626
променени са 62 файла, в които са добавени 1050 реда и са изтрити 599 реда
  1. 2 0
      saas-backen/src/main/java/com/pavis/app/saasbacken/dao/ResourceLibraryEntityMapper.java
  2. 2 0
      saas-backen/src/main/java/com/pavis/app/saasbacken/dao/TaxInfoMapper.java
  3. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/AuditInstitutionCertification.java
  4. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/AuditInstitutionLib.java
  5. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/Category.java
  6. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/CheckModule.java
  7. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/Dic.java
  8. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnclaveResearchCultivateLibrary.java
  9. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnclaveResearchDevCenterCheck.java
  10. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnclaveResearchDevCenterReport.java
  11. 4 5
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnterpriseBasicInfo.java
  12. 8 9
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnterpriseOtherInfo.java
  13. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/HighCultivateLibrary.java
  14. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/HighSelfCheck.java
  15. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/HighSelfCheckInfo.java
  16. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/HighSelfReport.java
  17. 1 2
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/InitDataChild.java
  18. 2 5
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/InitDataParent.java
  19. 2 7
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/InitDataThird.java
  20. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/IntellectualPropertyInfo.java
  21. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/IntermediaryInstitutionCertification.java
  22. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/IntermediaryInstitutionLib.java
  23. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/MunicipalResearchCenterCheck.java
  24. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/MunicipalResearchCenterReport.java
  25. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/MunicipalResearchCultivateLibrary.java
  26. 1 2
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/OperateLog.java
  27. 1 2
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/OrgRelPersonal.java
  28. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/PersonalInfo.java
  29. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/PotentialLibrary.java
  30. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProductInfo.java
  31. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvinceEnterpriseResearchCheck.java
  32. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialEnterpriseResearchCultivateLibrary.java
  33. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialResearchCenterCheck.java
  34. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialResearchCenterReport.java
  35. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialResearchCultivateLibrary.java
  36. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialTechnologySmallCheck.java
  37. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialTechnologySmallLibrary.java
  38. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialTechnologySmallReport.java
  39. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/QualityInfo.java
  40. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ResearchAchievementInfo.java
  41. 2 2
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ResourceLibrary.java
  42. 8 8
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ResourceLibraryEntity.java
  43. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ServiceItermOne.java
  44. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ServiceItermTwo.java
  45. 8 6
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/TaxInfo.java
  46. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/YoungEaglesCheck.java
  47. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/YoungEaglesCultivateLibrary.java
  48. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/entity/YoungEaglesReport.java
  49. 3 0
      saas-backen/src/main/java/com/pavis/app/saasbacken/form/CategoryField.java
  50. 3 0
      saas-backen/src/main/java/com/pavis/app/saasbacken/form/ModuleData.java
  51. 31 9
      saas-backen/src/main/java/com/pavis/app/saasbacken/form/OrgInfo.java
  52. 1 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/form/TaxParam.java
  53. 7 0
      saas-backen/src/main/java/com/pavis/app/saasbacken/service/EsService.java
  54. 40 0
      saas-backen/src/main/java/com/pavis/app/saasbacken/service/ResourceLibraryService.java
  55. 9 1
      saas-backen/src/main/java/com/pavis/app/saasbacken/service/TaxInfoService.java
  56. 60 10
      saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/EnterpriseBasicInfoServiceImpl.java
  57. 7 0
      saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/EnterpriseOtherInfoServiceImpl.java
  58. 171 0
      saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/ResourceLibraryServiceImpl.java
  59. 32 2
      saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/TaxInfoServiceImpl.java
  60. 133 13
      saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/other/EsServiceImpl.java
  61. 475 478
      saas-backen/src/main/java/com/pavis/app/saasbacken/utils/ExcelPatternMsgUtils.java
  62. 1 1
      saas-backen/src/main/resources/error.properties

+ 2 - 0
saas-backen/src/main/java/com/pavis/app/saasbacken/dao/ResourceLibraryEntityMapper.java

@@ -17,6 +17,8 @@ public interface ResourceLibraryEntityMapper extends ElasticsearchRepository<Res
 
     List<ResourceLibraryEntity> findByName(String name);
 
+    // List<ResourceLibraryEntity> findByUniqueId();
+
     List<ResourceLibraryEntity> findByRegisterAddress(String address);
 
     @Query("{ \"bool\" : { \"must\" : { \"term\" : { \"softwareCopyrightCount\" : 2 } } } }")

+ 2 - 0
saas-backen/src/main/java/com/pavis/app/saasbacken/dao/TaxInfoMapper.java

@@ -2,6 +2,7 @@ package com.pavis.app.saasbacken.dao;
 
 import com.pavis.app.saasbacken.entity.TaxInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author guan
  * @since 2021-10-29
  */
+@Component
 public interface TaxInfoMapper extends BaseMapper<TaxInfo> {
 
 }

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/AuditInstitutionCertification.java

@@ -29,7 +29,7 @@ public class AuditInstitutionCertification extends Model<AuditInstitutionCertifi
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业库id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/AuditInstitutionLib.java

@@ -29,7 +29,7 @@ public class AuditInstitutionLib extends Model<AuditInstitutionLib> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/Category.java

@@ -33,7 +33,7 @@ public class Category extends Model<Category> {
 
     @ApiModelProperty(value = "主键自增id")
     // @TableId(value = "id",type = IdType.ASSIGN_UUID)
-    @TableId(type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "编码")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/CheckModule.java

@@ -32,7 +32,7 @@ public class CheckModule extends Model<CheckModule> {
 
     @ApiModelProperty(value = "主键自增id")
     // @TableId(value = "id", type = IdType.INPUT)
-    @TableId(type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "资源库代码")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/Dic.java

@@ -32,7 +32,7 @@ public class Dic extends Model<Dic> {
 
     @ApiModelProperty(value = "主键自增id")
     // @TableId(value = "id", type = IdType.INPUT)
-    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "字典库代码")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnclaveResearchCultivateLibrary.java

@@ -29,7 +29,7 @@ public class EnclaveResearchCultivateLibrary extends Model<EnclaveResearchCultiv
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnclaveResearchDevCenterCheck.java

@@ -29,7 +29,7 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnclaveResearchDevCenterReport.java

@@ -29,7 +29,7 @@ public class EnclaveResearchDevCenterReport extends Model<EnclaveResearchDevCent
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 4 - 5
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnterpriseBasicInfo.java

@@ -34,8 +34,7 @@ public class EnterpriseBasicInfo{
     @ApiModelProperty(value = "主键自增id")
     // @TableId(value = "id", type = IdType.INPUT)
     // @TableId(value = "id",type = IdType.ASSIGN_UUID)
-    @TableId(value = "id",type = IdType.ASSIGN_UUID)
-    // @GeneratedValue(strategy = GenerationType.AUTO)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "企业logo")
@@ -100,7 +99,7 @@ public class EnterpriseBasicInfo{
     private String businessTerm;
 
     @ApiModelProperty(value = "行政区划")
-    private String administrativeArea;
+    private String district;
 
     @ApiModelProperty(value = "核准日期")
     private String approvalDate;
@@ -139,10 +138,10 @@ public class EnterpriseBasicInfo{
     private Integer softwareCopyrightCount;
 
     @ApiModelProperty(value = "职工总数")
-    private String employeeCount;
+    private Integer employeeCount;
 
     @ApiModelProperty(value = "研发人员数")
-    private String researchDevCount;
+    private Integer researchDevCount;
 
     @ApiModelProperty(value = "企业联系人信息关联id")
     private String contactsId;

+ 8 - 9
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnterpriseOtherInfo.java

@@ -1,7 +1,6 @@
 package com.pavis.app.saasbacken.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -31,7 +30,7 @@ import java.util.Date;
 public class EnterpriseOtherInfo{
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "企业基本信息关联id")
@@ -41,7 +40,7 @@ public class EnterpriseOtherInfo{
     private String isNationalHigh;
 
     @ApiModelProperty(value = "认定年份")
-    private String highIdentifiedYear;
+    private Integer highIdentifiedYear;
 
     @ApiModelProperty(value = "国高八大领域")
     private String highField;
@@ -56,7 +55,7 @@ public class EnterpriseOtherInfo{
     private String isKeyProvincialResearch;
 
     @ApiModelProperty(value = "认定年份")
-    private String keyProvincialIdentifiedYear;
+    private Integer keyProvincialIdentifiedYear;
 
     @ApiModelProperty(value = "省级重点企业研究院名称")
     private String keyProvincialIdentifiedName;
@@ -65,7 +64,7 @@ public class EnterpriseOtherInfo{
     private String isProvincialResearch;
 
     @ApiModelProperty(value = "认定年份")
-    private String provincialIdentifiedYear;
+    private Integer provincialIdentifiedYear;
 
     @ApiModelProperty(value = "省级企业研究院名称")
     private String provincialResearchName;
@@ -74,7 +73,7 @@ public class EnterpriseOtherInfo{
     private String isHighTechResearchDevCenter;
 
     @ApiModelProperty(value = "认定年份")
-    private String highTechIdentifiedYear;
+    private Integer highTechIdentifiedYear;
 
     @ApiModelProperty(value = "浙江省高新技术研究开发中心名称")
     private String highTechResearchCenterName;
@@ -83,19 +82,19 @@ public class EnterpriseOtherInfo{
     private String isProvincialTechnologySmall;
 
     @ApiModelProperty(value = "认定年份")
-    private String provincialTechSmallIdentifiedYear;
+    private Integer provincialTechSmallIdentifiedYear;
 
     @ApiModelProperty(value = "是/否雏鹰计划企业")
     private String isYoungEagles;
 
     @ApiModelProperty(value = "认定年份")
-    private String youngEaglesIdentifiedYear;
+    private Integer youngEaglesIdentifiedYear;
 
     @ApiModelProperty(value = "是/否市级研发中心")
     private String isMunicipalResearchCenter;
 
     @ApiModelProperty(value = "认定年份")
-    private String municipalResearchCenterIdentifiedYear;
+    private Integer municipalResearchCenterIdentifiedYear;
 
     @ApiModelProperty(value = "市级研发中心名称")
     private String municipalResearchCenterName;

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/HighCultivateLibrary.java

@@ -29,7 +29,7 @@ public class HighCultivateLibrary extends Model<HighCultivateLibrary> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/HighSelfCheck.java

@@ -29,7 +29,7 @@ public class HighSelfCheck extends Model<HighSelfCheck> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/HighSelfCheckInfo.java

@@ -29,7 +29,7 @@ public class HighSelfCheckInfo extends Model<HighSelfCheckInfo> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/HighSelfReport.java

@@ -29,7 +29,7 @@ public class HighSelfReport extends Model<HighSelfReport> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 2
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/InitDataChild.java

@@ -29,8 +29,7 @@ import java.util.Date;
 public class InitDataChild extends Model<InitDataChild> {
 
     @ApiModelProperty(value = "主键自增id")
-    // @TableId(value = "id", type = IdType.INPUT)
-    @TableId(type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "初始化数据父级代码")

+ 2 - 5
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/InitDataParent.java

@@ -1,9 +1,6 @@
 package com.pavis.app.saasbacken.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,7 +30,7 @@ public class InitDataParent extends Model<InitDataParent> {
 
     @ApiModelProperty(value = "主键自增id")
     // @TableId(value = "id", type = IdType.INPUT)
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "初始化数据父级代码")

+ 2 - 7
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/InitDataThird.java

@@ -1,9 +1,6 @@
 package com.pavis.app.saasbacken.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -32,9 +29,7 @@ import java.util.Date;
 public class InitDataThird extends Model<InitDataThird> {
 
     @ApiModelProperty(value = "主键自增id")
-    // @TableId(value = "id", type = IdType.INPUT)
-    // @TableId(value = "id",type = IdType.AUTO)
-    @TableId
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "初始化数据父级代码")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/IntellectualPropertyInfo.java

@@ -29,7 +29,7 @@ public class IntellectualPropertyInfo extends Model<IntellectualPropertyInfo> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "企业基本信息关联id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/IntermediaryInstitutionCertification.java

@@ -29,7 +29,7 @@ public class IntermediaryInstitutionCertification extends Model<IntermediaryInst
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/IntermediaryInstitutionLib.java

@@ -29,7 +29,7 @@ public class IntermediaryInstitutionLib extends Model<IntermediaryInstitutionLib
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/MunicipalResearchCenterCheck.java

@@ -29,7 +29,7 @@ public class MunicipalResearchCenterCheck extends Model<MunicipalResearchCenterC
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/MunicipalResearchCenterReport.java

@@ -29,7 +29,7 @@ public class MunicipalResearchCenterReport extends Model<MunicipalResearchCenter
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/MunicipalResearchCultivateLibrary.java

@@ -29,7 +29,7 @@ public class MunicipalResearchCultivateLibrary extends Model<MunicipalResearchCu
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 2
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/OperateLog.java

@@ -29,8 +29,7 @@ import java.util.Date;
 public class OperateLog extends Model<OperateLog> {
 
     @ApiModelProperty(value = "主键自增id")
-    // @TableId(value = "id", type = IdType.INPUT)
-    @TableId(type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "用户id")

+ 1 - 2
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/OrgRelPersonal.java

@@ -32,8 +32,7 @@ public class OrgRelPersonal extends Model<OrgRelPersonal> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    // @TableId(value = "id",type = IdType.ASSIGN_UUID)
-    @TableId(type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "资源库类型")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/PersonalInfo.java

@@ -30,7 +30,7 @@ import java.util.Date;
 public class PersonalInfo {
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "企业/高校基本信息关联id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/PotentialLibrary.java

@@ -30,7 +30,7 @@ public class PotentialLibrary extends Model<PotentialLibrary> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     //  1 国高 2 省科小 3雏鹰 4 市级研发中心 5 省级研发中心 6 省级研究院 7 飞地研发中心

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProductInfo.java

@@ -29,7 +29,7 @@ public class ProductInfo extends Model<ProductInfo> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "企业基本信息关联id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvinceEnterpriseResearchCheck.java

@@ -29,7 +29,7 @@ public class ProvinceEnterpriseResearchCheck extends Model<ProvinceEnterpriseRes
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialEnterpriseResearchCultivateLibrary.java

@@ -29,7 +29,7 @@ public class ProvincialEnterpriseResearchCultivateLibrary extends Model<Provinci
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialResearchCenterCheck.java

@@ -29,7 +29,7 @@ public class ProvincialResearchCenterCheck extends Model<ProvincialResearchCente
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialResearchCenterReport.java

@@ -29,7 +29,7 @@ public class ProvincialResearchCenterReport extends Model<ProvincialResearchCent
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialResearchCultivateLibrary.java

@@ -29,7 +29,7 @@ public class ProvincialResearchCultivateLibrary extends Model<ProvincialResearch
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialTechnologySmallCheck.java

@@ -29,7 +29,7 @@ public class ProvincialTechnologySmallCheck extends Model<ProvincialTechnologySm
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialTechnologySmallLibrary.java

@@ -29,7 +29,7 @@ public class ProvincialTechnologySmallLibrary extends Model<ProvincialTechnology
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ProvincialTechnologySmallReport.java

@@ -29,7 +29,7 @@ public class ProvincialTechnologySmallReport extends Model<ProvincialTechnologyS
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/QualityInfo.java

@@ -29,7 +29,7 @@ public class QualityInfo extends Model<QualityInfo> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "企业基本信息关联id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ResearchAchievementInfo.java

@@ -29,7 +29,7 @@ public class ResearchAchievementInfo extends Model<ResearchAchievementInfo> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "企业/高校基本信息关联id")

+ 2 - 2
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ResourceLibrary.java

@@ -22,7 +22,7 @@ import java.util.Date;
 @Builder
 public class ResourceLibrary implements Serializable {
 
-    @TableId(type = IdType.ID_WORKER_STR)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
     // 企业名称【(全名[可针对企业名称做dic词典]、关键词)、人才名称、专利名称、需求成功名称、产品名称、需求名称】
 
@@ -41,7 +41,7 @@ public class ResourceLibrary implements Serializable {
     private String industry;
     // 国高领域。
     private String highfield;
-    // 研发、飞地等类型,是否是国高 【逗号分隔】。
+    // 研发、飞地等类型,是否是国高 【逗号分隔】。1 国高 2 省级重点企业研究院 3 省级企业研究院 4 浙江省高新技术研究开发中心 5 省科小 6 雏鹰计划 7 市级研发中心 8 飞地研发中心
     private String othertype;
     // 国高认定年份。
     private Integer highIdentifiedYear;

+ 8 - 8
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ResourceLibraryEntity.java

@@ -29,7 +29,7 @@ import java.util.List;
 @Document(indexName = "#{@indexNameGenerator.commonIndex()}")
 public class ResourceLibraryEntity implements Serializable {
 
-    @TableId(type = IdType.ID_WORKER_STR)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
     // 企业名称【(全名[可针对企业名称做dic词典]、关键词)、人才名称、专利名称、需求成功名称、产品名称、需求名称】
     @Field(type = FieldType.Text,analyzer = "ik_max_word",searchAnalyzer = "ik_max_word")
@@ -63,25 +63,25 @@ public class ResourceLibraryEntity implements Serializable {
     private Date createTime;
     // 国高认定年份。
     @Field(type = FieldType.Keyword)
-    private String highIdentifiedYear;
+    private Integer highIdentifiedYear;
     // 省级重点企业研究院认定年份。
     @Field(type = FieldType.Keyword)
-    private String keyProvincialIdentifiedYear;
+    private Integer keyProvincialIdentifiedYear;
     // 省级企业研究院认定年份。
     @Field(type = FieldType.Keyword)
-    private String provincialIdentifiedYear;
+    private Integer provincialIdentifiedYear;
     // 浙江省高新技术研究开发中心认定年份。
     @Field(type = FieldType.Keyword)
-    private String highTechIdentifiedYear;
+    private Integer highTechIdentifiedYear;
     // 省科小认定年份。
     @Field(type = FieldType.Keyword)
-    private String provincialTechSmallIdentifiedYear;
+    private Integer provincialTechSmallIdentifiedYear;
     // 雏鹰计划认定年份。
     @Field(type = FieldType.Keyword)
-    private String youngEaglesIdentifiedYear;
+    private Integer youngEaglesIdentifiedYear;
     // 市级研发中心认定年份。
     @Field(type = FieldType.Keyword)
-    private String municipalResearchCenterIdentifiedYear;
+    private Integer municipalResearchCenterIdentifiedYear;
 
     // 飞地研发中心专职人员数
     @Field(type = FieldType.Integer)

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ServiceItermOne.java

@@ -29,7 +29,7 @@ public class ServiceItermOne extends Model<ServiceItermOne> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联中介机构id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/ServiceItermTwo.java

@@ -29,7 +29,7 @@ public class ServiceItermTwo extends Model<ServiceItermTwo> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联服务事项1级信息id")

+ 8 - 6
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/TaxInfo.java

@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -24,19 +23,22 @@ import java.util.Date;
 @Accessors(chain = true)
 @TableName("tax_info")
 @ApiModel(value="TaxInfo对象", description="")
+@Builder
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class TaxInfo extends Model<TaxInfo> {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "企业基本信息关联id")
     private String enterpriseId;
 
     @ApiModelProperty(value = "近N年")
-    private String taxYear;
+    private Integer taxYear;
 
     @ApiModelProperty(value = "近N年营业收入")
     private Double annualRevenue;

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/YoungEaglesCheck.java

@@ -29,7 +29,7 @@ public class YoungEaglesCheck extends Model<YoungEaglesCheck> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/YoungEaglesCultivateLibrary.java

@@ -29,7 +29,7 @@ public class YoungEaglesCultivateLibrary extends Model<YoungEaglesCultivateLibra
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/entity/YoungEaglesReport.java

@@ -29,7 +29,7 @@ public class YoungEaglesReport extends Model<YoungEaglesReport> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "主键自增id")
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "关联企业id")

+ 3 - 0
saas-backen/src/main/java/com/pavis/app/saasbacken/form/CategoryField.java

@@ -1,5 +1,7 @@
 package com.pavis.app.saasbacken.form;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +19,7 @@ import lombok.Setter;
 public class CategoryField {
 
     @ApiModelProperty(value = "主键id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "编码")

+ 3 - 0
saas-backen/src/main/java/com/pavis/app/saasbacken/form/ModuleData.java

@@ -1,5 +1,7 @@
 package com.pavis.app.saasbacken.form;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -18,6 +20,7 @@ import lombok.Setter;
 public class ModuleData{
 
     @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     @ApiModelProperty(value = "功能名称")

+ 31 - 9
saas-backen/src/main/java/com/pavis/app/saasbacken/form/OrgInfo.java

@@ -28,7 +28,7 @@ public class OrgInfo extends BasicInfo {
     private String isNationalHigh;
 
     @ApiModelProperty(value = "认定年份")
-    private String highIdentifiedYear;
+    private Integer highIdentifiedYear;
 
     @ApiModelProperty(value = "国高八大领域")
     private String highField;
@@ -43,7 +43,7 @@ public class OrgInfo extends BasicInfo {
     private String isKeyProvincialResearch;
 
     @ApiModelProperty(value = "认定年份")
-    private String keyProvincialIdentifiedYear;
+    private Integer keyProvincialIdentifiedYear;
 
     @ApiModelProperty(value = "省级重点企业研究院名称")
     private String keyProvincialIdentifiedName;
@@ -52,7 +52,7 @@ public class OrgInfo extends BasicInfo {
     private String isProvincialResearch;
 
     @ApiModelProperty(value = "认定年份")
-    private String provincialIdentifiedYear;
+    private Integer provincialIdentifiedYear;
 
     @ApiModelProperty(value = "省级企业研究院名称")
     private String provincialResearchName;
@@ -61,7 +61,7 @@ public class OrgInfo extends BasicInfo {
     private String isHighTechResearchDevCenter;
 
     @ApiModelProperty(value = "认定年份")
-    private String highTechIdentifiedYear;
+    private Integer highTechIdentifiedYear;
 
     @ApiModelProperty(value = "浙江省高新技术研究开发中心名称")
     private String highTechResearchCenterName;
@@ -70,19 +70,19 @@ public class OrgInfo extends BasicInfo {
     private String isProvincialTechnologySmall;
 
     @ApiModelProperty(value = "认定年份")
-    private String provincialTechSmallIdentifiedYear;
+    private Integer provincialTechSmallIdentifiedYear;
 
     @ApiModelProperty(value = "是/否雏鹰计划企业")
     private String isYoungEagles;
 
     @ApiModelProperty(value = "认定年份")
-    private String youngEaglesIdentifiedYear;
+    private Integer youngEaglesIdentifiedYear;
 
     @ApiModelProperty(value = "是/否市级研发中心")
     private String isMunicipalResearchCenter;
 
     @ApiModelProperty(value = "认定年份")
-    private String municipalResearchCenterIdentifiedYear;
+    private Integer municipalResearchCenterIdentifiedYear;
 
     @ApiModelProperty(value = "市级研发中心名称")
     private String municipalResearchCenterName;
@@ -96,8 +96,30 @@ public class OrgInfo extends BasicInfo {
     @ApiModelProperty(value = "飞地研发中心场地面积")
     private Double areaOfEnclave;
 
-    @ApiModelProperty(value = "乡镇(街道)平台")
-    private String townshipStreetPlatform;
+    @ApiModelProperty(value = "近三年")
+    private Integer nearlyThree;
 
+    @ApiModelProperty(value = "近三年营业收入(万元)")
+    private Double annualRevenueThree;
 
+    @ApiModelProperty(value = "近三年允许扣除的研发费用(万元)")
+    private Double rdDeductibleThree;
+
+    @ApiModelProperty(value = "近两年")
+    private Integer nearlyTwo;
+
+    @ApiModelProperty(value = "近两年营业收入(万元)")
+    private Double annualRevenueTwo;
+
+    @ApiModelProperty(value = "近两年允许扣除的研发费用(万元)")
+    private Double rdDeductibleTwo;
+
+    @ApiModelProperty(value = "近一年")
+    private Integer nearlyOne;
+
+    @ApiModelProperty(value = "近一年营业收入(万元)")
+    private Double annualRevenueOne;
+
+    @ApiModelProperty(value = "近一年允许扣除的研发费用(万元)")
+    private Double rdDeductibleOne;
 }

+ 1 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/form/TaxParam.java

@@ -22,7 +22,7 @@ public class TaxParam {
     private Integer year;
     // 区域,逗号分词。
     @Field(type = FieldType.Integer)
-    private Integer val;
+    private Double val;
 
 
 }

+ 7 - 0
saas-backen/src/main/java/com/pavis/app/saasbacken/service/EsService.java

@@ -24,4 +24,11 @@ public interface EsService {
      */
     List mysqlToEs(List<ResourceLibrary> resourceLibraryList) throws IOException;
 
+    /**
+     * 保存资源库信息至es库。
+     * @param resourceLibraries
+     * @return
+     */
+    List saveResourceLibsToEs(List<ResourceLibrary> resourceLibraries) throws IOException;
+
 }

+ 40 - 0
saas-backen/src/main/java/com/pavis/app/saasbacken/service/ResourceLibraryService.java

@@ -0,0 +1,40 @@
+package com.pavis.app.saasbacken.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pavis.app.saasbacken.entity.EnterpriseBasicInfo;
+import com.pavis.app.saasbacken.entity.EnterpriseOtherInfo;
+import com.pavis.app.saasbacken.entity.ResourceLibrary;
+import com.pavis.app.saasbacken.entity.TaxInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  研究成果信息
+ * </p>
+ *
+ * @author guan
+ * @since 2021-10-29
+ */
+public interface ResourceLibraryService extends IService<ResourceLibrary> {
+
+    /**
+     * 根据唯一标识id查询资源库列表。
+     * @param uniqueId
+     * @return
+     */
+    List<ResourceLibrary> selByUniqueId(String uniqueId);
+    /**
+     * 将企业基本信息转化为资源库信息。
+     * @param basicInfos
+     * @return
+     */
+    List<ResourceLibrary> dealBasicResourceLib(List<EnterpriseBasicInfo> basicInfos, List<TaxInfo> taxInfos);
+
+    /**
+     * 将企业其他信息转化为资源库信息。
+     * @param otherInfos
+     * @return
+     */
+    List<ResourceLibrary> dealOtherResourceLib(List<EnterpriseOtherInfo> otherInfos);
+}

+ 9 - 1
saas-backen/src/main/java/com/pavis/app/saasbacken/service/TaxInfoService.java

@@ -1,7 +1,9 @@
 package com.pavis.app.saasbacken.service;
 
-import com.pavis.app.saasbacken.entity.TaxInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pavis.app.saasbacken.entity.TaxInfo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +15,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface TaxInfoService extends IService<TaxInfo> {
 
+    /**
+     * 处理税务数据。
+     * @param addTaxInfos
+     * @return
+     */
+    List<TaxInfo> dealTaxInfo(List<TaxInfo> addTaxInfos,String orgId);
 }

+ 60 - 10
saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/EnterpriseBasicInfoServiceImpl.java

@@ -8,15 +8,15 @@ import com.pavis.app.saasbacken.common.IgnoreUtils;
 import com.pavis.app.saasbacken.dao.EnterpriseBasicInfoMapper;
 import com.pavis.app.saasbacken.entity.EnterpriseBasicInfo;
 import com.pavis.app.saasbacken.entity.EnterpriseOtherInfo;
+import com.pavis.app.saasbacken.entity.ResourceLibrary;
+import com.pavis.app.saasbacken.entity.TaxInfo;
 import com.pavis.app.saasbacken.form.OrgInfo;
-import com.pavis.app.saasbacken.service.CategoryService;
-import com.pavis.app.saasbacken.service.EnterpriseBasicInfoService;
-import com.pavis.app.saasbacken.service.EnterpriseOtherInfoService;
-import com.pavis.app.saasbacken.service.EsService;
+import com.pavis.app.saasbacken.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -33,6 +33,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicInfoMapper, EnterpriseBasicInfo> implements EnterpriseBasicInfoService {
 
     @Resource
@@ -50,6 +51,12 @@ public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicI
     @Autowired
     private PersonalInfoServiceImpl personalInfoService;
 
+    @Autowired
+    private ResourceLibraryService resourceLibraryService;
+
+    @Autowired
+    private TaxInfoService taxInfoService;
+
     @Override
     public List<EnterpriseBasicInfo> orgBasicAdd(List<Object> basicInfo) throws IOException {
         List<OrgInfo> basicInfos = JSONObject.parseArray(JSONObject.toJSONString(basicInfo), OrgInfo.class);
@@ -59,9 +66,13 @@ public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicI
         // 企业其他数据
         EnterpriseOtherInfo addOtherInfo;
         List<EnterpriseOtherInfo> addOtherInfos = new ArrayList<>();
+        // 企业税务数据接口
+        TaxInfo addTaxInfo;
+        List<List<TaxInfo>> addTaxInfos = new ArrayList<>();
+        List<TaxInfo> tmpTaxInfos = new ArrayList<>();
         for (OrgInfo info : basicInfos) {
             // todo 根据企业id判断是新增或者更新。 企业名称和社会统一信用代码。
-            if (null == info.getId() && StringUtils.isEmpty(info.getId())) {
+            if (null == info.getId() || StringUtils.isEmpty(info.getId())) {
                 // id为空,进行新增操作。
                 log.info("新增操作", info.getId());
                 // 根据企业名称或者社会统一信用代码
@@ -69,6 +80,7 @@ public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicI
                         .eq(EnterpriseBasicInfo::getUnifySocialCreditCode, info.getUnifySocialCreditCode()));
                 if (enterpriseBasicInfos.size() > 0) {
                     // 企业基本信息已存在,
+                    log.info("企业基本信息已存在,主键id:{}",enterpriseBasicInfos.get(0).getId());
                     info.setId(enterpriseBasicInfos.get(0).getId());
                 }
             }
@@ -84,6 +96,12 @@ public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicI
             // todo 待处理字段如:国高八大领域。
             addOtherInfos.add(addOtherInfo);
 
+            // 企业税务数据。
+            tmpTaxInfos.add(TaxInfo.builder().taxYear(info.getNearlyThree()).annualRevenue(info.getAnnualRevenueThree()).rdDeductible(info.getRdDeductibleThree()).build());
+            tmpTaxInfos.add(TaxInfo.builder().taxYear(info.getNearlyTwo()).annualRevenue(info.getAnnualRevenueTwo()).rdDeductible(info.getRdDeductibleTwo()).build());
+            tmpTaxInfos.add(TaxInfo.builder().taxYear(info.getNearlyOne()).annualRevenue(info.getAnnualRevenueOne()).rdDeductible(info.getRdDeductibleOne()).build());
+            addTaxInfos.add(tmpTaxInfos);
+
             // 所属行业 需要单独处理,做一下转换后进行存储。
             addBasicInfo.setIndustry(categoryService.dealCategory(info.getIndustry(), true));
             // 企业类型:国有企业 集体所有制企业 私营企业 股份制企业 联营企业 外商投资企业 港澳台企业 股份合作企业 有限责任公司 其他企业。
@@ -119,11 +137,15 @@ public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicI
         log.info("save basic-org info res:{}", b);
         log.info("addedBasicInfos after:{}", JSON.toJSONString(addedBasicInfos));
 
-
+        
         List<EnterpriseOtherInfo> otherInfos = new ArrayList<>();
-        // 处理人员信息关联关系。
+        List<TaxInfo> taxInfos = new ArrayList<>();
+        // 处理各信息关联关系。
         for (int i = 0; i < addedBasicInfos.size(); i++) {
 
+            // 建立企业与税务数据的关联关系。
+            taxInfos = taxInfoService.dealTaxInfo(addTaxInfos.get(i), addedBasicInfos.get(i).getId());
+
             System.err.println("*****************orgId:" + addedBasicInfos.get(i).getId());
 
             // 1 企业联系人姓名及联系方式。
@@ -179,21 +201,49 @@ public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicI
         }
 
         log.info("update addedBasicInfos:{}", JSON.toJSONString(addedBasicInfos));
-        // 更新企业人员信息:
+        // 新增或更新企业人员信息:
         boolean b1 = saveOrUpdateBatch(addedBasicInfos);
         log.info("update basic-info res:{}", b1);
         log.info("update basic-info:{}", JSON.toJSONString(addedBasicInfos));
 
+        // 新增或更新企业税务数据。
+        log.info("update addTaxInfos:{}", JSON.toJSONString(addTaxInfos));
+        boolean b5 = taxInfoService.saveOrUpdateBatch(taxInfos);
+        log.info("save-update tax-info res:{}",b5);
+        log.info("update tax-info:{}", JSON.toJSONString(taxInfos));
+
 
-        // 处理企业库其他信息
+        // 同步基本信息至资源库。
+        List<ResourceLibrary> basicResourceLibraries = resourceLibraryService.dealBasicResourceLib(addedBasicInfos,taxInfos);
+        boolean b3 = resourceLibraryService.saveOrUpdateBatch(basicResourceLibraries);
+        log.info("save-or-update resourcelib-basic-data res:{}",b3);
+
+        // 新增或更新企业库其他信息。
         log.info("update addOtherInfos:{}", JSON.toJSONString(otherInfos));
         // todo 根据企业id判断是否已存在数据,
-        // List<EnterpriseOtherInfo> enterpriseOtherInfos =
         // 批量新增企业其他信息。
         boolean b2 = enterpriseOtherInfoService.dealOtherInfos(otherInfos);
         log.info("save other-info res:{}", b2);
         log.info("update other-info:{}", JSON.toJSONString(otherInfos));
 
+        System.err.println("########################:" + otherInfos.get(0).getId());
+
+        // 同步其他信息至资源库。
+        List<ResourceLibrary> otherResourceLibraries = resourceLibraryService.dealOtherResourceLib(otherInfos);
+        boolean b4 = resourceLibraryService.saveOrUpdateBatch(otherResourceLibraries);
+        log.info("save-or-update resourcelib-other-data res:{}",b4);
+
+        List<ResourceLibrary> resourceLibraries = new ArrayList<>();
+        for (EnterpriseBasicInfo info : addedBasicInfos) {
+            List<ResourceLibrary> resourceLibs = resourceLibraryService.selByUniqueId(info.getId());
+            if (resourceLibs.size() > 0){
+                resourceLibraries.add(resourceLibs.get(0));
+            }
+        }
+
+        // 同步信息至es库。
+        esService.saveResourceLibsToEs(resourceLibraries);
+
         return esService.selEsByName(addedBasicInfos.get(0).getName());
     }
 }

+ 7 - 0
saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/EnterpriseOtherInfoServiceImpl.java

@@ -4,8 +4,10 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pavis.app.saasbacken.entity.EnterpriseOtherInfo;
 import com.pavis.app.saasbacken.dao.EnterpriseOtherInfoMapper;
+import com.pavis.app.saasbacken.entity.ResourceLibrary;
 import com.pavis.app.saasbacken.service.EnterpriseOtherInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pavis.app.saasbacken.service.ResourceLibraryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +30,9 @@ public class EnterpriseOtherInfoServiceImpl extends ServiceImpl<EnterpriseOtherI
     @Autowired
     private EnterpriseOtherInfoMapper enterpriseOtherInfoMapper;
 
+    @Autowired
+    private ResourceLibraryService resourceLibraryService;
+
     @Override
     public Boolean dealOtherInfos(List<EnterpriseOtherInfo> otherInfos) {
         // 处理企业库其他信息
@@ -50,6 +55,8 @@ public class EnterpriseOtherInfoServiceImpl extends ServiceImpl<EnterpriseOtherI
         boolean b2 = saveOrUpdateBatch(dealOtherInfos);
         log.info("save other-info res:{}", b2);
         log.info("update other-info:{}", JSON.toJSONString(dealOtherInfos));
+
+
         return b2;
     }
 }

+ 171 - 0
saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/ResourceLibraryServiceImpl.java

@@ -0,0 +1,171 @@
+package com.pavis.app.saasbacken.service.impl.base;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pavis.app.saasbacken.common.IgnoreUtils;
+import com.pavis.app.saasbacken.dao.ResourceLibraryMapper;
+import com.pavis.app.saasbacken.entity.EnterpriseBasicInfo;
+import com.pavis.app.saasbacken.entity.EnterpriseOtherInfo;
+import com.pavis.app.saasbacken.entity.ResourceLibrary;
+import com.pavis.app.saasbacken.entity.TaxInfo;
+import com.pavis.app.saasbacken.form.TaxParam;
+import com.pavis.app.saasbacken.service.ResourceLibraryService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *  税务信息
+ * </p>
+ *
+ * @author guan
+ * @since 2021-10-29
+ */
+@Service
+@Slf4j
+@Transactional(rollbackFor = Exception.class)
+public class ResourceLibraryServiceImpl extends ServiceImpl<ResourceLibraryMapper, ResourceLibrary> implements ResourceLibraryService {
+
+    @Autowired
+    private ResourceLibraryMapper resourceLibraryMapper;
+
+    @Override
+    public List<ResourceLibrary> selByUniqueId(String uniqueId) {
+        log.info("reslib uniqueId:{}",uniqueId);
+        return resourceLibraryMapper.selectList(new QueryWrapper<ResourceLibrary>().lambda()
+                .eq(ResourceLibrary::getUniqueId,uniqueId));
+    }
+
+    @Override
+    public List<ResourceLibrary> dealBasicResourceLib(List<EnterpriseBasicInfo> basicInfos, List<TaxInfo> taxInfos) {
+        ResourceLibrary resourceLibrary;
+        List<ResourceLibrary> resourceLibraries = new ArrayList<>();
+        for (EnterpriseBasicInfo info : basicInfos) {
+            // 转化为资源库数据。
+            resourceLibrary = new ResourceLibrary();
+            IgnoreUtils.copyPropertiesIgnoreNull(info,resourceLibrary);
+            // 关联各资源库主键id
+            resourceLibrary.setUniqueId(info.getId());
+            // 各资源库类型
+            resourceLibrary.setResType("6");
+
+            // 处理税务数据。
+            List<TaxParam> revenueTaxParams = new ArrayList<>();
+            TaxParam revenueTaxParam;
+            List<TaxParam> rdTaxParams = new ArrayList<>();
+            TaxParam rdTaxParam;
+            for (TaxInfo taxInfo : taxInfos) {
+                revenueTaxParam = new TaxParam();
+                revenueTaxParam.setYear(taxInfo.getTaxYear());
+                revenueTaxParam.setVal(taxInfo.getAnnualRevenue());
+                revenueTaxParams.add(revenueTaxParam);
+
+                rdTaxParam = new TaxParam();
+                rdTaxParam.setYear(taxInfo.getTaxYear());
+                rdTaxParam.setVal(taxInfo.getRdDeductible());
+                rdTaxParams.add(rdTaxParam);
+            }
+
+            resourceLibrary.setAnnualRevenue(JSON.toJSONString(revenueTaxParams));
+            resourceLibrary.setRdDeductible(JSON.toJSONString(rdTaxParams));
+
+            // 根据企业id判断是否已存在数据,
+            List<ResourceLibrary> resourceLibraryLists = selByUniqueId(info.getId());
+            System.err.println("reslib basic size:" + resourceLibraryLists.size());
+            if (resourceLibraryLists.size() > 0){
+                // 资源库已存在数据,则做更新操作,赋值主键id。
+                resourceLibrary.setId(resourceLibraryLists.get(0).getId());
+            }
+            resourceLibraries.add(resourceLibrary);
+        }
+        log.info("resourceLibs:{}", JSON.toJSONString(resourceLibraries));
+        return resourceLibraries;
+    }
+
+    @Override
+    public List<ResourceLibrary> dealOtherResourceLib(List<EnterpriseOtherInfo> otherInfos) {
+        ResourceLibrary resourceLibrary;
+        List<ResourceLibrary> resourceLibraries = new ArrayList<>();
+        for (EnterpriseOtherInfo info : otherInfos) {
+            // 转化为资源库数据。
+            resourceLibrary = new ResourceLibrary();
+            IgnoreUtils.copyPropertiesIgnoreNull(info,resourceLibrary);
+            // 关联各资源库主键id
+            resourceLibrary.setUniqueId(info.getEnterpriseId());
+            // 各资源库类型
+            resourceLibrary.setResType("6");
+            List<Integer> otherTypes = dealOtherType(info);
+            String otherType = JSON.toJSONString(otherTypes);
+            resourceLibrary.setOthertype(StringUtils.remove(StringUtils.remove(otherType,"["),"]"));
+
+            // todo 年度营收、允许扣除的研发费用待处理,需要存储为对象。
+
+            // 根据企业id判断是否已存在数据,
+            List<ResourceLibrary> resourceLibraryLists = selByUniqueId(info.getEnterpriseId());
+            System.err.println("reslib other size:" + resourceLibraryLists.size());
+            if (resourceLibraryLists.size() > 0){
+                // 资源库已存在数据,则做更新操作,赋值主键id。
+                log.info("资源库信息已存在,id:{}",resourceLibraryLists.get(0).getId());
+                log.info("资源库信息已存在,orgId:{}",resourceLibraryLists.get(0).getUniqueId());
+                resourceLibrary.setId(resourceLibraryLists.get(0).getId());
+            }
+            resourceLibraries.add(resourceLibrary);
+        }
+        log.info("resourceLibs:{}", JSON.toJSONString(resourceLibraries));
+        return resourceLibraries;
+    }
+
+    /**
+     * 其他类型数据汇总,以逗号分割。
+     * @param info
+     * @return
+     */
+    public List<Integer> dealOtherType(EnterpriseOtherInfo info){
+        // 1 国高 2 省级重点企业研究院 3 省级企业研究院 4 浙江省高新技术研究开发中心 5 省科小 6 雏鹰计划 7 市级研发中心 8 飞地研发中心
+        List<Integer> otherTypes = new ArrayList<>();
+        if ("是".equals(info.getIsNationalHigh())){
+            otherTypes.add(1);
+        }
+        if ("是".equals(info.getIsKeyProvincialResearch())){
+            otherTypes.add(2);
+        }
+        if ("是".equals(info.getIsProvincialResearch())){
+            otherTypes.add(3);
+        }
+        if ("是".equals(info.getIsHighTechResearchDevCenter())){
+            otherTypes.add(4);
+        }
+        if ("是".equals(info.getIsProvincialTechnologySmall())){
+            otherTypes.add(5);
+        }
+        if ("是".equals(info.getIsYoungEagles())){
+            otherTypes.add(6);
+        }
+        if ("是".equals(info.getIsMunicipalResearchCenter())){
+            otherTypes.add(7);
+        }
+        if ("是".equals(info.getIsEnclaveResearchDevCenter())){
+            otherTypes.add(8);
+        }
+        // String otherType = "";
+        // switch (typeKey) {
+        //     case "isNationalHigh":
+        //         // 国高信息
+        //         otherType = "1";
+        //         break;
+        //     case "602":
+        //         // 省级重点企业研究院
+        //         break;
+        //     default:
+        //         otherType= "";
+        // }
+        return otherTypes;
+    }
+}

+ 32 - 2
saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/TaxInfoServiceImpl.java

@@ -1,11 +1,16 @@
 package com.pavis.app.saasbacken.service.impl.base;
 
-import com.pavis.app.saasbacken.entity.TaxInfo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pavis.app.saasbacken.dao.TaxInfoMapper;
+import com.pavis.app.saasbacken.entity.TaxInfo;
 import com.pavis.app.saasbacken.service.TaxInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  税务信息
@@ -17,4 +22,29 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaxInfoServiceImpl extends ServiceImpl<TaxInfoMapper, TaxInfo> implements TaxInfoService {
 
+    @Autowired
+    private TaxInfoMapper taxInfoMapper;
+
+    @Override
+    public List<TaxInfo> dealTaxInfo(List<TaxInfo> addTaxInfos, String orgId) {
+        List<TaxInfo> taxInfos = new ArrayList<>();
+        if (addTaxInfos.size() > 0){
+            // 企业税务数据。
+            for (TaxInfo taxInfo : addTaxInfos) {
+                // 根据企业id查询是否存在税务数据列表。
+                List<TaxInfo> selTaxInfos = taxInfoMapper.selectList(new QueryWrapper<TaxInfo>().lambda()
+                        .eq(TaxInfo::getEnterpriseId,orgId).eq(TaxInfo::getTaxYear,taxInfo.getTaxYear()));
+                if (selTaxInfos.size() > 0){
+                    // 已存在税务数据信息。
+                    taxInfo.setId(selTaxInfos.get(0).getId());
+                    taxInfos.add(taxInfo);
+                }else {
+                    // 企业税务数据不存在。
+                    taxInfo.setEnterpriseId(orgId);
+                    taxInfos.add(taxInfo);
+                }
+            }
+        }
+        return taxInfos;
+    }
 }

+ 133 - 13
saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/other/EsServiceImpl.java

@@ -11,12 +11,14 @@ import com.pavis.app.saasbacken.entity.ResourceLibraryEntity;
 import com.pavis.app.saasbacken.form.TaxParam;
 import com.pavis.app.saasbacken.service.EsService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.common.unit.TimeValue;
@@ -24,9 +26,10 @@ import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.TermQueryBuilder;
+import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -79,12 +82,12 @@ public class EsServiceImpl implements EsService {
         BoolQueryBuilder childBoolQueryBuilder = new BoolQueryBuilder()
                 .must(QueryBuilders.nestedQuery("annualRevenue",
                         QueryBuilders.boolQuery()
-                                .must(QueryBuilders.matchQuery("annualRevenue.year","2019")), ScoreMode.None)
+                                .must(QueryBuilders.matchQuery("annualRevenue.year", "2019")), ScoreMode.None)
                 );
         BoolQueryBuilder childBoolQueryBuilder2 = new BoolQueryBuilder()
                 .must(QueryBuilders.nestedQuery("annualRevenue",
                         QueryBuilders.boolQuery()
-                                .must(QueryBuilders.matchQuery("annualRevenue.val","73")), ScoreMode.None)
+                                .must(QueryBuilders.matchQuery("annualRevenue.val", "73")), ScoreMode.None)
                 );
         BoolQueryBuilder childBoolQueryBuilder3 = new BoolQueryBuilder()
                 .must(QueryBuilders.nestedQuery("annualRevenue",
@@ -106,7 +109,7 @@ public class EsServiceImpl implements EsService {
         // 排序规则
         searchSourceBuilder.sort("createTime", SortOrder.DESC);
         // 设置超时
-        TimeValue t=new TimeValue(3000);
+        TimeValue t = new TimeValue(3000);
         searchSourceBuilder.timeout(t);
         // Class<?> clazz = ElasticUtil.getClazz(FquestionES.class.getName());
         // //查询结果集
@@ -132,7 +135,7 @@ public class EsServiceImpl implements EsService {
         for (ResourceLibraryEntity byName : byNames) {
             System.err.println("***" + byName.getName());
             enterpriseBasicInfo = new EnterpriseBasicInfo();
-            IgnoreUtils.copyPropertiesIgnoreNull(byName,enterpriseBasicInfo);
+            IgnoreUtils.copyPropertiesIgnoreNull(byName, enterpriseBasicInfo);
             enterpriseBasicInfos.add(enterpriseBasicInfo);
         }
 
@@ -148,7 +151,7 @@ public class EsServiceImpl implements EsService {
 
     @Override
     public List mysqlToEs(List<ResourceLibrary> resourceLibraryList) throws IOException {
-        log.info("当前索引名称:{}",indexName);
+        log.info("当前索引名称:{}", indexName);
 
         // 批量导入es库。
         BulkRequest bulkRequest = new BulkRequest();
@@ -157,11 +160,11 @@ public class EsServiceImpl implements EsService {
         // 批处理请求。
         for (int i = 0; i < resourceLibraryList.size(); i++) {
             ResourceLibraryEntity resourceLibraryEntity = new ResourceLibraryEntity();
-            IgnoreUtils.copyPropertiesIgnoreNull(resourceLibraryList.get(i),resourceLibraryEntity);
+            IgnoreUtils.copyPropertiesIgnoreNull(resourceLibraryList.get(i), resourceLibraryEntity);
             resourceLibraryEntity.setAnnualRevenue(JSONArray.parseArray
                     (resourceLibraryList.get(i).getAnnualRevenue(), TaxParam.class));
             resourceLibraryEntity.setRdDeductible(JSONArray.parseArray
-                    (resourceLibraryList.get(i).getRdDeductible(),TaxParam.class));
+                    (resourceLibraryList.get(i).getRdDeductible(), TaxParam.class));
             System.err.println("to es entity:" + JSON.toJSONString(resourceLibraryEntity));
             bulkRequest.add(
                     // new IndexRequest(indexName)
@@ -172,15 +175,100 @@ public class EsServiceImpl implements EsService {
         }
         BulkResponse bulkResp = client.bulk(bulkRequest, RequestOptions.DEFAULT);
         System.err.println(bulkResp.hasFailures()); // 是否失败,返回false 代表成功。
-        Map<String,Object> resMap = new HashMap<>();
-        if (false == bulkResp.hasFailures()){
-            resMap.put("mes","save to es succ...");
-        }else {
-            resMap.put("mes","save to es failed...");
+        Map<String, Object> resMap = new HashMap<>();
+        if (false == bulkResp.hasFailures()) {
+            resMap.put("mes", "save to es succ...");
+        } else {
+            resMap.put("mes", "save to es failed...");
         }
         return null;
     }
 
+    @Override
+    public List saveResourceLibsToEs(List<ResourceLibrary> resourceLibraries) throws IOException {
+
+        // 批量导入es库。
+        BulkRequest bulkRequest = new BulkRequest();
+        bulkRequest.timeout("10000s");
+
+
+        UpdateRequest updateBulkRequest = new UpdateRequest();
+        updateBulkRequest.timeout("10000s");
+
+        ResourceLibraryEntity resourceLibraryEntity;
+        List<ResourceLibraryEntity> resourceLibraryEntities = new ArrayList<>();
+        for (ResourceLibrary resourceLibrary : resourceLibraries) {
+            resourceLibraryEntity = new ResourceLibraryEntity();
+            IgnoreUtils.copyPropertiesIgnoreNull(resourceLibrary, resourceLibraryEntity);
+            resourceLibraryEntities.add(resourceLibraryEntity);
+
+            resourceLibraryEntity.setAnnualRevenue(JSONArray.parseArray
+                    (resourceLibrary.getAnnualRevenue(), TaxParam.class));
+            resourceLibraryEntity.setRdDeductible(JSONArray.parseArray
+                    (resourceLibrary.getRdDeductible(), TaxParam.class));
+            log.info("resourceLibrary val:{}", resourceLibrary.getRdDeductible());
+            if (null != resourceLibrary.getId() && StringUtils.isNotEmpty(resourceLibrary.getId())) {
+                log.info("es库信息已存在:{}", resourceLibrary.getId());
+                // 更新操作。
+                SearchResponse searchUpResp = searchByParam("uniqueId", resourceLibrary.getUniqueId());
+                if (searchUpResp.getHits().getTotalHits().value > 0){
+                    for (SearchHit hit : searchUpResp.getHits()) {
+                        String id = hit.getId();
+                        System.err.println("es id:{}" + id);
+                        Map<String, Object> map = hit.getSourceAsMap();
+                        System.out.println("map;" + JSON.toJSONString(map));
+                        // 批量更新
+                        bulkRequest.add(
+                                new UpdateRequest()
+                                        .index(indexName)
+                                        .id(id)
+                                        .doc(JSON.toJSONString(resourceLibraryEntity), XContentType.JSON)
+                                // .upsert(JSON.toJSONString(resourceLibraryEntity),XContentType.JSON)
+                        );
+                    }
+                }else {
+                    log.info("es库信息不存在:{}", resourceLibrary.getId());
+                    // 新增操作。
+                    // 批量请求
+                    bulkRequest.add(
+                            new IndexRequest(indexName)
+                                    .source(JSON.toJSONString(resourceLibraryEntity), XContentType.JSON)
+                    );
+                }
+            } else {
+                log.info("es库信息不存在:{}", resourceLibrary.getId());
+                // 新增操作。
+                // 批量请求
+                bulkRequest.add(
+                        new IndexRequest(indexName)
+                                .source(JSON.toJSONString(resourceLibraryEntity), XContentType.JSON)
+                );
+            }
+        }
+
+        BulkResponse bulkResp = client.bulk(bulkRequest, RequestOptions.DEFAULT);
+        System.err.println("bulkResp:" + bulkResp.hasFailures()); // 是否失败,返回false 代表成功。
+        // UpdateResponse updateBulkResp = client.update(updateBulkRequest, RequestOptions.DEFAULT);
+        // System.err.println("updateBulkResp:" + updateBulkResp.status()); // 是否失败,返回false 代表成功。
+        Map<String, Object> resMap = new HashMap<>();
+        if (false == bulkResp.hasFailures()) {
+            resMap.put("mes", "save to es succ...");
+        } else {
+            resMap.put("mes", "save to es failed...");
+        }
+
+        // 存在,更新。
+
+        // 不存在,批量插入。
+
+        return null;
+    }
+
+    /**
+     * 根据企业名称做全文检索。
+     *
+     * @throws IOException
+     */
     public void searchByName() throws IOException {
         String key = "name";
         String val = "苏州";
@@ -215,4 +303,36 @@ public class EsServiceImpl implements EsService {
         SearchResponse searchResp = client.search(searchRequest, RequestOptions.DEFAULT);
         System.out.println("search total:" + searchResp.getHits().getTotalHits().value);
     }
+
+    public SearchResponse searchByParam(String key, String val) throws IOException {
+        log.info("key:{},val:{}", key, val);
+        SearchRequest searchRequest = new SearchRequest(indexName);
+        // SearchRequest searchRequest = new SearchRequest("es_dome");
+        // 构建搜索条件
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+
+        // 查询条件,用QueryBuilders实现
+        //         QueryBuilders.matchAllQuery() // 匹配所有。
+
+        // QueryBuilders.termQuery 精确查找
+        TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(key, val);
+
+//         MatchAllQueryBuilder matchAllQueryBuilder = QueryBuilders.matchAllQuery();
+        Integer page = 1;
+        // Integer rows = 3568;
+        Integer rows = 609165;
+//        Integer page = 7;
+//        Integer rows = 100000;
+        searchSourceBuilder.from((page - 1) * rows);
+        searchSourceBuilder.size(rows);
+//        searchSourceBuilder.sort("")
+        searchSourceBuilder.query(termQueryBuilder);
+        searchSourceBuilder.timeout(new TimeValue(600000, TimeUnit.SECONDS));
+
+        searchRequest.source(searchSourceBuilder);
+
+        SearchResponse searchResp = client.search(searchRequest, RequestOptions.DEFAULT);
+        System.out.println("search total:" + searchResp.getHits().getTotalHits());
+        return searchResp;
+    }
 }

+ 475 - 478
saas-backen/src/main/java/com/pavis/app/saasbacken/utils/ExcelPatternMsgUtils.java

@@ -1,10 +1,7 @@
 package com.pavis.app.saasbacken.utils;
 
-import cn.ubitech.ttc.common.POIWordUtil;
-import cn.ubitech.ttc.excel.entry.*;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang.StringUtils;
+import com.pavis.app.saasbacken.excel.org.EnterpriseBasicInfoExcelData;
 
 import java.util.Map;
 
@@ -242,480 +239,480 @@ public class ExcelPatternMsgUtils {
         return excelData;
     }
 
-    //企业初始化模板(溧水节点)
-    public static EnterpriseBasicInfoExcelDataLishui initLishuiBasicHeadInfo() {
-        String initHead = BASIC_TL_HEAD_LISHUI;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-
-        EnterpriseBasicInfoExcelDataLishui excelData = EnterpriseBasicInfoExcelDataLishui.builder()
-                .logo(map.get(0).toString())
-                .name(map.get(1).toString())
-                .orgcode(map.get(2).toString())
-                .detailaddress(map.get(3).toString())
-                .category(map.get(4).toString())
-                .peopleengagedNum(map.get(5).toString())
-                .technicalpersonnelcount(map.get(6).toString())
-                .socialSecuritycount(map.get(7).toString())
-                .patentcount(map.get(8).toString())
-                .patentforutilitycount(map.get(9).toString())
-                .patentfordesigncount(map.get(10).toString())
-                .pctcount(map.get(11).toString())
-                .patentforsoftwarecount(map.get(12).toString())
-                .summary(map.get(13).toString())
-                .contactor(map.get(14).toString())
-                .tel(map.get(15).toString())
-                .legalrepresentativename(map.get(16).toString())
-                .legalrepresentativetel(map.get(17).toString())
-                .technologyContact(map.get(18).toString())
-                .technologyContactphone(map.get(19).toString())
-                .sale2018(map.get(20).toString())
-                .tax2018(map.get(21).toString())
-                .researchinput2018(map.get(22).toString())
-                .sale2019(map.get(23).toString())
-                .tax2019(map.get(24).toString())
-                .researchinput2019(map.get(25).toString())
-                .sale2020(map.get(26).toString())
-                .tax2020(map.get(27).toString())
-                .researchinput2020(map.get(28).toString())
-                .cooperateuniversity(map.get(29).toString())
-                .cooperatecontent(map.get(30).toString())
-                .cooperatetosigntime(map.get(31).toString())
-                .cooperateuniversity2(map.get(32).toString())
-                .cooperatecontent2(map.get(33).toString())
-                .cooperatetosigntime2(map.get(34).toString())
-                .cooperateuniversity3(map.get(35).toString())
-                .cooperatecontent3(map.get(36).toString())
-                .cooperatetosigntime3(map.get(37).toString())
-                .researchtime1(map.get(38).toString())
-                .researchname1(map.get(39).toString())
-                .researchtime2(map.get(40).toString())
-                .researchname2(map.get(41).toString())
-                .researchtime3(map.get(42).toString())
-                .researchname3(map.get(43).toString())
-                .leadproduct1(map.get(44).toString())
-                .leadproduct2(map.get(45).toString())
-                .leadproduct3(map.get(46).toString())
-                .highandnewproduct1(map.get(47).toString())
-                .highandnewproduct2(map.get(48).toString())
-                .highandnewproduct3(map.get(49).toString())
-                .projectname1(map.get(50).toString())
-                .acquiretime1(map.get(51).toString())
-                .projectname2(map.get(52).toString())
-                .acquiretime2(map.get(53).toString())
-                .build();
-        return excelData;
-    }
-    /**
-     * 税务数据
-     * @return
-     */
-    public static CompanyTaxLkExcelData initTongluTaxHeadInfo() {
-        String initHead = TAX_TL_HEAD;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-        // 企业名称    统一社会信用代码    时间段1    企业税收利润1 企业税收收入1 研发费加计扣除1
-        // 留县税收1   时间段2    企业税收利润2 企业税收收入2 研发费加计扣除2    留县税收2
-        // 时间段3    企业税收利润3 企业税收收入3 研发费加计扣除3    留县税收3   时间段4
-        // 企业税收利润4 企业税收收入4 研发费加计扣除4    留县税收4
-        CompanyTaxLkExcelData excelData = CompanyTaxLkExcelData.builder()
-                // 企业名称
-                .orgname(map.get(0).toString())
-                .threeyearsrevenue(map.get(1).toString())
-                .threeyeardeductexpenses(map.get(2).toString())
-                .twoyearrevenue(map.get(3).toString())
-                .twoyeardeductexpenses(map.get(4).toString())
-                .lastyearrevenue(map.get(5).toString())
-                .lastyeardeductexpenses(map.get(6).toString())
-                .build();
-        return excelData;
-    }
-
-    /**
-     * 专利信息(桐庐)
-    * @return
-     */
-    public static EnterprisePatentInfoExcelData initTongluPatentHeadInfo() {
-        String initHead = PATENT_TL_HEAD;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-        // 企业名称    统一社会信用代码    专利名称    申请号 申请日 专利类型
-        // 专利权人    授权号
-        EnterprisePatentInfoExcelData excelData = EnterprisePatentInfoExcelData.builder()
-                // 企业名称
-                .orgname(map.get(0).toString())
-                // 统一社会信用代码
-                .orgcode(map.get(1).toString())
-                // 专利名称
-                .intellectualpropertyname(map.get(2).toString())
-                // 申请号
-                .applicationnumber(map.get(3).toString())
-                // 申请日
-                .applydate(map.get(4).toString())
-                // 专利类型
-                .inteltypename(map.get(5).toString())
-                // 专利权人(申请人)
-                .applyperson(map.get(6).toString())
-                // 授权号
-                .licensenumber(map.get(7).toString())
-                // todo 授权日期?????是否存在???????
-                .licensedate(map.get(8).toString())
-                .build();
-        return excelData;
-    }
-
-    //企业专利(溧水)
-    public static EnterprisePatentInfoExcelDataLishui initLishuiPatentHeadInfo() {
-        String initHead = PATENT_TL_HEAD_LISHUI;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-        // 企业名称    统一社会信用代码    专利名称    申请号 申请日 专利类型
-        // 专利权人    授权号
-        EnterprisePatentInfoExcelDataLishui excelData = EnterprisePatentInfoExcelDataLishui.builder()
-                // 企业名称
-                .orgname(map.get(0).toString())
-                // 统一社会信用代码
-                .orgcode(map.get(1).toString())
-                // 专利名称
-                .intellectualpropertyname(map.get(2).toString())
-                // 申请号
-                .applicationnumber(map.get(3).toString())
-                // 申请日
-                .applydate(map.get(4).toString())
-                // 专利类型
-                .inteltypename(map.get(5).toString())
-                // 专利权人(申请人)
-                .applyperson(map.get(6).toString())
-                // 授权号
-                .licensenumber(map.get(7).toString())
-                .build();
-        return excelData;
-    }
-
-    /**
-     * 高校成果信息
-     * @return
-     */
-    public static CollegeUniversResultInfoExcelData initTongluCuHeadInfo() {
-        String initHead = CU_TL_RESULTS;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-        // 所属单位    成果名称    应用领域(domain)    合作模式    成熟度(proficiency )
-        // 联系人(contactor  ) 联系方式(tel  、qq)   联系邮箱(contactemail    )
-        // 研究人员    成果描述(content)    知识产权授权号
-        CollegeUniversResultInfoExcelData excelData = CollegeUniversResultInfoExcelData.builder()
-                // todo 所属单位,需要做转化;
-                .orgname(map.get(0).toString())
-                // 成果名称
-                .researchfindingname(map.get(1).toString())
-                // 应用领域
-                .domain(map.get(2).toString())
-                // 合作模式,下拉选择,需要转换。
-                .cooperationmodel(map.get(3).toString())
-                // 成熟度,下拉选择,需要转换。
-                .proficiency(map.get(4).toString())
-                // 联系人
-                .contactor(map.get(5).toString())
-                // 联系方式
-                .tel(map.get(6).toString())
-                // 联系邮箱
-                .email(map.get(7).toString())
-                // 研究人员
-                .researchmember(map.get(8).toString())
-                // 成果描述
-                .researchdetail(map.get(9).toString())
-                // todo 知识产权授权号,需要关联CompanyProductLk表
-                .intellectualpropertylicensenum(map.get(10).toString())
-                .build();
-        return excelData;
-    }
-
-    /**
-     * 金融库(桐庐)
-     * @return
-     */
-    public static FinancialProductInfoExcelData initTongluFinancialHeadInfo() {
-        String initHead = FINANCIAL_TL_HEAD;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-        // 单位  联系人(financial_contact) 电话(financial_contactphone)  职务  关键词
-        // 特色贷产品名称1    贷款利率1   注1(日利率or月利率or年利率、是否浮动利率)    产品简介1
-        // 特色贷产品名称2    贷款利率2   注2  产品简介2   特色贷产品名称3    贷款利率3   注3
-        // 产品简介3   其他金融产品名称a   简介a 其他金融产品名称b   简介b 其他金融产品名称c
-        // 简介c 银行简介
-        FinancialProductInfoExcelData excelData = FinancialProductInfoExcelData.builder()
-                // 企业名称
-                .orgname(map.get(0).toString())
-                // 联系人
-                .contacts(map.get(1).toString())
-                // 电话
-                .phone(map.get(2).toString())
-                // 职务
-                .position(map.get(3).toString())
-                // 关键词
-                .keywords(map.get(4).toString())
-                // 特色贷产品名称1
-                .productname(map.get(5).toString())
-                // 贷款利率1
-                .loanrate(map.get(6).toString())
-                // 注1(日利率or月利率or年利率、是否浮动利率)
-                .ratenote(map.get(7).toString())
-                // 产品简介1
-                .productdescription(map.get(8).toString())
-                // 特色贷产品名称2
-                .featuredloanproducttwo(map.get(9).toString())
-                // 贷款利率2
-                .loanratetwo(map.get(10).toString())
-                // 注2
-                .ratenotetwo(map.get(11).toString())
-                // 产品简介2
-                .productabouttwo(map.get(12).toString())
-                // 特色贷产品名称3
-                .featuredloanproductthree(map.get(13).toString())
-                // 贷款利率3
-                .loanratethree(map.get(14).toString())
-                // 注3
-                .ratenotethree(map.get(15).toString())
-                // 产品简介3
-                .productaboutthree(map.get(16).toString())
-                // 其他金融产品名称a
-                .otherproducta(map.get(17).toString())
-                // 简介a
-                .introductiona(map.get(18).toString())
-                // 其他金融产品名称b
-                .otherproductb(map.get(19).toString())
-                // 简介b
-                .introductionb(map.get(20).toString())
-                // 其他金融产品名称c
-                .otherproductc(map.get(21).toString())
-                // 简介c
-                .introductionc(map.get(22).toString())
-                // 银行简介
-                .bankintroduction(map.get(23).toString())
-                .build();
-        System.out.println("init fina:" + JSON.toJSONString(excelData));
-        return excelData;
-    }
-
-    //金融库(溧水)
-    public static FinancialProductInfoExcelDataLishui initLishuiFinancialHeadInfo() {
-        String initHead = FINANCIAL_TL_HEAD_LISHUI;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead, Map.class);
-        //单位    联系人     电话      职务      关键词     产品名称1       产品简介1
-        //产品名称2     产品简介2       产品名称3       产品简介3       产品名称4
-        //产品简介4     产品名称5       产品简介5       银行简介
-        FinancialProductInfoExcelDataLishui excelData = FinancialProductInfoExcelDataLishui.builder()
-                .orgname(map.get(0).toString())
-                .contacts(map.get(1).toString())
-                .phone(map.get(2).toString())
-                .position(map.get(3).toString())
-                .keywords(map.get(4).toString())
-                .productOneName(map.get(5).toString())
-                .productOneContent(map.get(6).toString())
-                .productTwoName(map.get(7).toString())
-                .productTwoContent(map.get(8).toString())
-                .productThreeName(map.get(9).toString())
-                .productThreeContent(map.get(10).toString())
-                .productFourName(map.get(11).toString())
-                .productFourContent(map.get(12).toString())
-                .productFiveName(map.get(13).toString())
-                .productFiveContent(map.get(14).toString())
-                .bankintroduction(map.get(15).toString())
-                .build();
-        return excelData;
-    }
-
-
-    /**
-     * 人才信息
-     * @return
-     */
-    public static PersonnelInfoExcelData initTongluPersonnelHeadInfo() {
-        String initHead = PERSONNEL_TL_HEAD;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-        //企业名称    社会统一信用代码    姓名  出生年月birthday    出生地 政治面貌
-        // 职务(positionaltitles)  专业  学历(education   )  职称(rank)
-        // 联系电话    现从事技术领域(多)techcategorycode  人才认定级别  主要贡献
-        PersonnelInfoExcelData excelData = PersonnelInfoExcelData.builder()
-                // todo 企业名称,可从companyid查询关联关系得到。
-                .orgname(map.get(0).toString())
-                // todo 统一社会信用代码,可从companyid查询关联关系得到。
-                .orgcode(map.get(1).toString())
-                // 姓名
-                .name(map.get(2).toString())
-                // 出生年月
-                .birthday(map.get(3).toString())
-                // todo 出生地,需要新增
-                .birthplace(map.get(4).toString())
-                // todo 政治面貌,需要新增
-                .politicallandscape(map.get(5).toString())
-                // 职务
-                .position(map.get(6).toString())
-                // todo 专业(研究领域)????
-                .domain(map.get(7).toString())
-                // 学历 "高中", 6701 "中专", 6702 "大专", 6703 "学士", 6704
-                // "硕士", 6705  "博士", 6706
-                // "博士后", 6707 "其他", 6708
-                .academicdegreename(map.get(8).toString())
-                // 职称
-                .positionaltitles(map.get(9).toString())
-                // 联系电话
-                .tel(map.get(10).toString())
-                // todo 现从事技术领域(多)???
-                .category(map.get(11).toString())
-                // todo 人才认定级别,需要新增
-                .talentidentificationlevel(map.get(12).toString())
-                // 主要贡献
-                .remark(map.get(13).toString())
-                .build();
-        return excelData;
-    }
-
-    //人才信息(溧水节点)
-    public static PersonnelInfoExcelDataLishui initLishuiPersonnerlHeadInfo() {
-        String initHead = PERSONNEL_TL_HEAD_LISHUI;
-        Map<Integer, Object> map = JSONObject.parseObject(initHead, Map.class);
-        PersonnelInfoExcelDataLishui excelData = PersonnelInfoExcelDataLishui.builder()
-                .orgname(map.get(0).toString())
-                .orgcode(map.get(1).toString())
-                .name(map.get(2).toString())
-                .sex(map.get(3).toString())
-                .birthday(map.get(4).toString())
-                .nationality(map.get(5).toString())
-                .birthplace(map.get(6).toString())
-                .nation(map.get(7).toString())
-                .politicallandscape(map.get(8).toString())
-                .tel(map.get(9).toString())
-                .communicateAddress(map.get(10).toString())
-                .domain(map.get(11).toString())
-                .academicdegreename(map.get(12).toString())
-                .isAbroad(map.get(13).toString())
-                .abroadState(map.get(14).toString())
-                .schoolname(map.get(15).toString())
-                .isfulltime(map.get(16).toString())
-                .position(map.get(17).toString())
-                .entryTime(map.get(18).toString())
-                .dimissionTime(map.get(19).toString())
-                .positionaltitles(map.get(20).toString())
-                .category(map.get(21).toString())
-                .talentidentificationlevel(map.get(22).toString())
-                .remark(map.get(23).toString())
-                .build();
-        return excelData;
-    }
-
-    /**
-     * 专家信息
-     * @return
-     */
-    public static ExpertInfoExcelData initTongluExpertHeadInfo(String nodeId) {
-        String initHead = null;
-        if ("320117400".equals(nodeId)) {
-            initHead = EXPERT_TL_HEAD_LISHUI;
-        }else if ("330122000".equals(nodeId)) {
-            initHead = EXPERT_TL_HEAD;
-        }
-        if (StringUtils.isNotEmpty(initHead)) {
-            Map<Integer, Object> map = JSONObject.parseObject(initHead, Map.class);
-            // 所属学校    所属院校    专家姓名    研究领域    学位(academicdegree )
-            // 职称(rank)  联系方式    邮箱(email  )  简介≤200字
-            // 关键词(输入多个标签时以“,”隔开
-            ExpertInfoExcelData excelData = ExpertInfoExcelData.builder()
-                    // 所属学校,对应oid(Companyid-->orgid)
-                    .school(map.get(0).toString())
-                    // todo 所属院校,需要新增
-                    .academy(map.get(1).toString())
-                    // 专家姓名
-                    .name(map.get(2).toString())
-                    // 研究领域
-                    .domain(map.get(3).toString())
-                    // 学位
-                    .academicdegreename(map.get(4).toString())
-                    // 职称
-                    .position(map.get(5).toString())
-                    // 联系方式
-                    .tel(map.get(6).toString())
-                    // 邮箱
-                    .email(map.get(7).toString())
-                    // 简介
-                    .about(map.get(8).toString())
-                    // 关键词
-                    .talentslabelname(map.get(9).toString())
-                    .build();
-            return excelData;
-        }
-        return null;
-    }
-
-    /**
-     * 政策库
-     * @return
-     */
-    public static PolicyBasicInfoExcelData initTongluPolicyHeadInfo() {
-        String initHead = POLICY_TL_HEAD;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-        // 关键词 政策名称    政策编号    政策内容
-        PolicyBasicInfoExcelData excelData = PolicyBasicInfoExcelData.builder()
-                // todo 关键词,需要新增。
-                .keywords(map.get(0).toString())
-                // 政策名称
-                .title(map.get(1).toString())
-                // todo 政策编号,需要新增。
-                .policynumber(map.get(2).toString())
-                // 政策内容
-                .content(map.get(3).toString())
-                .build();
-        return excelData;
-    }
-
-    //政策库(溧水节点)
-    public static PolicyBasicInfoExcelDataLishui initLishuiPolicyHeadInfo() {
-        String initHead = POLICY_TL_HEAD_LISHUI;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
-        PolicyBasicInfoExcelDataLishui excelData = PolicyBasicInfoExcelDataLishui.builder()
-                .title(map.get(0).toString())
-                .policyLevel(map.get(1).toString())
-                .policynumber(map.get(2).toString())
-                .content(map.get(3).toString())
-                .url(map.get(4).toString())
-                .name(map.get(5).toString())
-                .tel(map.get(6).toString())
-                .remark(map.get(7).toString())
-                .build();
-        return excelData;
-    }
-
-    /**
-     * 平台库
-     * @return
-     */
-    public static PlatformInfoExcelDate initLishuiPlatformHeadInfo() {
-        String initHead = PLATFORM_TL_HEAD_LISHUI;
-        Map<Integer,Object> map = JSONObject.parseObject(initHead, Map.class);
-        //级别    平台名称    联系地址    孵化面积/㎡  运营单位    统一社会信用代码
-        //联系人   联系方式    截止目前在孵企业数量  截止目前毕业企业数量  备注  简介
-        PlatformInfoExcelDate platformInfoExcelDate = PlatformInfoExcelDate.builder()
-                .category(map.get(0).toString())
-                .title(map.get(1).toString())
-                .address(map.get(2).toString())
-                .factoryarea(map.get(3).toString())
-                .affiliatedorg(map.get(4).toString())
-                .code(map.get(5).toString())
-                .contactor(map.get(6).toString())
-                .tel(map.get(7).toString())
-                .techtype(map.get(8).toString())
-                .starType(map.get(9).toString())
-                .remark(map.get(10).toString())
-                .content(map.get(11).toString())
-                .build();
-        return platformInfoExcelDate;
-    }
-
-
-
-
-
-
-
-    public static void main(String[] args) {
-        System.out.println(POIWordUtil.processInteltype("发明实用"));
-        System.out.println(POIWordUtil.processInteltype("发明"));
-        System.out.println(POIWordUtil.processInteltype("离开"));
-    }
+    // //企业初始化模板(溧水节点)
+    // public static EnterpriseBasicInfoExcelDataLishui initLishuiBasicHeadInfo() {
+    //     String initHead = BASIC_TL_HEAD_LISHUI;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //
+    //     EnterpriseBasicInfoExcelDataLishui excelData = EnterpriseBasicInfoExcelDataLishui.builder()
+    //             .logo(map.get(0).toString())
+    //             .name(map.get(1).toString())
+    //             .orgcode(map.get(2).toString())
+    //             .detailaddress(map.get(3).toString())
+    //             .category(map.get(4).toString())
+    //             .peopleengagedNum(map.get(5).toString())
+    //             .technicalpersonnelcount(map.get(6).toString())
+    //             .socialSecuritycount(map.get(7).toString())
+    //             .patentcount(map.get(8).toString())
+    //             .patentforutilitycount(map.get(9).toString())
+    //             .patentfordesigncount(map.get(10).toString())
+    //             .pctcount(map.get(11).toString())
+    //             .patentforsoftwarecount(map.get(12).toString())
+    //             .summary(map.get(13).toString())
+    //             .contactor(map.get(14).toString())
+    //             .tel(map.get(15).toString())
+    //             .legalrepresentativename(map.get(16).toString())
+    //             .legalrepresentativetel(map.get(17).toString())
+    //             .technologyContact(map.get(18).toString())
+    //             .technologyContactphone(map.get(19).toString())
+    //             .sale2018(map.get(20).toString())
+    //             .tax2018(map.get(21).toString())
+    //             .researchinput2018(map.get(22).toString())
+    //             .sale2019(map.get(23).toString())
+    //             .tax2019(map.get(24).toString())
+    //             .researchinput2019(map.get(25).toString())
+    //             .sale2020(map.get(26).toString())
+    //             .tax2020(map.get(27).toString())
+    //             .researchinput2020(map.get(28).toString())
+    //             .cooperateuniversity(map.get(29).toString())
+    //             .cooperatecontent(map.get(30).toString())
+    //             .cooperatetosigntime(map.get(31).toString())
+    //             .cooperateuniversity2(map.get(32).toString())
+    //             .cooperatecontent2(map.get(33).toString())
+    //             .cooperatetosigntime2(map.get(34).toString())
+    //             .cooperateuniversity3(map.get(35).toString())
+    //             .cooperatecontent3(map.get(36).toString())
+    //             .cooperatetosigntime3(map.get(37).toString())
+    //             .researchtime1(map.get(38).toString())
+    //             .researchname1(map.get(39).toString())
+    //             .researchtime2(map.get(40).toString())
+    //             .researchname2(map.get(41).toString())
+    //             .researchtime3(map.get(42).toString())
+    //             .researchname3(map.get(43).toString())
+    //             .leadproduct1(map.get(44).toString())
+    //             .leadproduct2(map.get(45).toString())
+    //             .leadproduct3(map.get(46).toString())
+    //             .highandnewproduct1(map.get(47).toString())
+    //             .highandnewproduct2(map.get(48).toString())
+    //             .highandnewproduct3(map.get(49).toString())
+    //             .projectname1(map.get(50).toString())
+    //             .acquiretime1(map.get(51).toString())
+    //             .projectname2(map.get(52).toString())
+    //             .acquiretime2(map.get(53).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    // /**
+    //  * 税务数据
+    //  * @return
+    //  */
+    // public static CompanyTaxLkExcelData initTongluTaxHeadInfo() {
+    //     String initHead = TAX_TL_HEAD;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //     // 企业名称    统一社会信用代码    时间段1    企业税收利润1 企业税收收入1 研发费加计扣除1
+    //     // 留县税收1   时间段2    企业税收利润2 企业税收收入2 研发费加计扣除2    留县税收2
+    //     // 时间段3    企业税收利润3 企业税收收入3 研发费加计扣除3    留县税收3   时间段4
+    //     // 企业税收利润4 企业税收收入4 研发费加计扣除4    留县税收4
+    //     CompanyTaxLkExcelData excelData = CompanyTaxLkExcelData.builder()
+    //             // 企业名称
+    //             .orgname(map.get(0).toString())
+    //             .threeyearsrevenue(map.get(1).toString())
+    //             .threeyeardeductexpenses(map.get(2).toString())
+    //             .twoyearrevenue(map.get(3).toString())
+    //             .twoyeardeductexpenses(map.get(4).toString())
+    //             .lastyearrevenue(map.get(5).toString())
+    //             .lastyeardeductexpenses(map.get(6).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    // /**
+    //  * 专利信息(桐庐)
+    // * @return
+    //  */
+    // public static EnterprisePatentInfoExcelData initTongluPatentHeadInfo() {
+    //     String initHead = PATENT_TL_HEAD;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //     // 企业名称    统一社会信用代码    专利名称    申请号 申请日 专利类型
+    //     // 专利权人    授权号
+    //     EnterprisePatentInfoExcelData excelData = EnterprisePatentInfoExcelData.builder()
+    //             // 企业名称
+    //             .orgname(map.get(0).toString())
+    //             // 统一社会信用代码
+    //             .orgcode(map.get(1).toString())
+    //             // 专利名称
+    //             .intellectualpropertyname(map.get(2).toString())
+    //             // 申请号
+    //             .applicationnumber(map.get(3).toString())
+    //             // 申请日
+    //             .applydate(map.get(4).toString())
+    //             // 专利类型
+    //             .inteltypename(map.get(5).toString())
+    //             // 专利权人(申请人)
+    //             .applyperson(map.get(6).toString())
+    //             // 授权号
+    //             .licensenumber(map.get(7).toString())
+    //             // todo 授权日期?????是否存在???????
+    //             .licensedate(map.get(8).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    // //企业专利(溧水)
+    // public static EnterprisePatentInfoExcelDataLishui initLishuiPatentHeadInfo() {
+    //     String initHead = PATENT_TL_HEAD_LISHUI;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //     // 企业名称    统一社会信用代码    专利名称    申请号 申请日 专利类型
+    //     // 专利权人    授权号
+    //     EnterprisePatentInfoExcelDataLishui excelData = EnterprisePatentInfoExcelDataLishui.builder()
+    //             // 企业名称
+    //             .orgname(map.get(0).toString())
+    //             // 统一社会信用代码
+    //             .orgcode(map.get(1).toString())
+    //             // 专利名称
+    //             .intellectualpropertyname(map.get(2).toString())
+    //             // 申请号
+    //             .applicationnumber(map.get(3).toString())
+    //             // 申请日
+    //             .applydate(map.get(4).toString())
+    //             // 专利类型
+    //             .inteltypename(map.get(5).toString())
+    //             // 专利权人(申请人)
+    //             .applyperson(map.get(6).toString())
+    //             // 授权号
+    //             .licensenumber(map.get(7).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    // /**
+    //  * 高校成果信息
+    //  * @return
+    //  */
+    // public static CollegeUniversResultInfoExcelData initTongluCuHeadInfo() {
+    //     String initHead = CU_TL_RESULTS;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //     // 所属单位    成果名称    应用领域(domain)    合作模式    成熟度(proficiency )
+    //     // 联系人(contactor  ) 联系方式(tel  、qq)   联系邮箱(contactemail    )
+    //     // 研究人员    成果描述(content)    知识产权授权号
+    //     CollegeUniversResultInfoExcelData excelData = CollegeUniversResultInfoExcelData.builder()
+    //             // todo 所属单位,需要做转化;
+    //             .orgname(map.get(0).toString())
+    //             // 成果名称
+    //             .researchfindingname(map.get(1).toString())
+    //             // 应用领域
+    //             .domain(map.get(2).toString())
+    //             // 合作模式,下拉选择,需要转换。
+    //             .cooperationmodel(map.get(3).toString())
+    //             // 成熟度,下拉选择,需要转换。
+    //             .proficiency(map.get(4).toString())
+    //             // 联系人
+    //             .contactor(map.get(5).toString())
+    //             // 联系方式
+    //             .tel(map.get(6).toString())
+    //             // 联系邮箱
+    //             .email(map.get(7).toString())
+    //             // 研究人员
+    //             .researchmember(map.get(8).toString())
+    //             // 成果描述
+    //             .researchdetail(map.get(9).toString())
+    //             // todo 知识产权授权号,需要关联CompanyProductLk表
+    //             .intellectualpropertylicensenum(map.get(10).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    // /**
+    //  * 金融库(桐庐)
+    //  * @return
+    //  */
+    // public static FinancialProductInfoExcelData initTongluFinancialHeadInfo() {
+    //     String initHead = FINANCIAL_TL_HEAD;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //     // 单位  联系人(financial_contact) 电话(financial_contactphone)  职务  关键词
+    //     // 特色贷产品名称1    贷款利率1   注1(日利率or月利率or年利率、是否浮动利率)    产品简介1
+    //     // 特色贷产品名称2    贷款利率2   注2  产品简介2   特色贷产品名称3    贷款利率3   注3
+    //     // 产品简介3   其他金融产品名称a   简介a 其他金融产品名称b   简介b 其他金融产品名称c
+    //     // 简介c 银行简介
+    //     FinancialProductInfoExcelData excelData = FinancialProductInfoExcelData.builder()
+    //             // 企业名称
+    //             .orgname(map.get(0).toString())
+    //             // 联系人
+    //             .contacts(map.get(1).toString())
+    //             // 电话
+    //             .phone(map.get(2).toString())
+    //             // 职务
+    //             .position(map.get(3).toString())
+    //             // 关键词
+    //             .keywords(map.get(4).toString())
+    //             // 特色贷产品名称1
+    //             .productname(map.get(5).toString())
+    //             // 贷款利率1
+    //             .loanrate(map.get(6).toString())
+    //             // 注1(日利率or月利率or年利率、是否浮动利率)
+    //             .ratenote(map.get(7).toString())
+    //             // 产品简介1
+    //             .productdescription(map.get(8).toString())
+    //             // 特色贷产品名称2
+    //             .featuredloanproducttwo(map.get(9).toString())
+    //             // 贷款利率2
+    //             .loanratetwo(map.get(10).toString())
+    //             // 注2
+    //             .ratenotetwo(map.get(11).toString())
+    //             // 产品简介2
+    //             .productabouttwo(map.get(12).toString())
+    //             // 特色贷产品名称3
+    //             .featuredloanproductthree(map.get(13).toString())
+    //             // 贷款利率3
+    //             .loanratethree(map.get(14).toString())
+    //             // 注3
+    //             .ratenotethree(map.get(15).toString())
+    //             // 产品简介3
+    //             .productaboutthree(map.get(16).toString())
+    //             // 其他金融产品名称a
+    //             .otherproducta(map.get(17).toString())
+    //             // 简介a
+    //             .introductiona(map.get(18).toString())
+    //             // 其他金融产品名称b
+    //             .otherproductb(map.get(19).toString())
+    //             // 简介b
+    //             .introductionb(map.get(20).toString())
+    //             // 其他金融产品名称c
+    //             .otherproductc(map.get(21).toString())
+    //             // 简介c
+    //             .introductionc(map.get(22).toString())
+    //             // 银行简介
+    //             .bankintroduction(map.get(23).toString())
+    //             .build();
+    //     System.out.println("init fina:" + JSON.toJSONString(excelData));
+    //     return excelData;
+    // }
+    //
+    // //金融库(溧水)
+    // public static FinancialProductInfoExcelDataLishui initLishuiFinancialHeadInfo() {
+    //     String initHead = FINANCIAL_TL_HEAD_LISHUI;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead, Map.class);
+    //     //单位    联系人     电话      职务      关键词     产品名称1       产品简介1
+    //     //产品名称2     产品简介2       产品名称3       产品简介3       产品名称4
+    //     //产品简介4     产品名称5       产品简介5       银行简介
+    //     FinancialProductInfoExcelDataLishui excelData = FinancialProductInfoExcelDataLishui.builder()
+    //             .orgname(map.get(0).toString())
+    //             .contacts(map.get(1).toString())
+    //             .phone(map.get(2).toString())
+    //             .position(map.get(3).toString())
+    //             .keywords(map.get(4).toString())
+    //             .productOneName(map.get(5).toString())
+    //             .productOneContent(map.get(6).toString())
+    //             .productTwoName(map.get(7).toString())
+    //             .productTwoContent(map.get(8).toString())
+    //             .productThreeName(map.get(9).toString())
+    //             .productThreeContent(map.get(10).toString())
+    //             .productFourName(map.get(11).toString())
+    //             .productFourContent(map.get(12).toString())
+    //             .productFiveName(map.get(13).toString())
+    //             .productFiveContent(map.get(14).toString())
+    //             .bankintroduction(map.get(15).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    //
+    // /**
+    //  * 人才信息
+    //  * @return
+    //  */
+    // public static PersonnelInfoExcelData initTongluPersonnelHeadInfo() {
+    //     String initHead = PERSONNEL_TL_HEAD;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //     //企业名称    社会统一信用代码    姓名  出生年月birthday    出生地 政治面貌
+    //     // 职务(positionaltitles)  专业  学历(education   )  职称(rank)
+    //     // 联系电话    现从事技术领域(多)techcategorycode  人才认定级别  主要贡献
+    //     PersonnelInfoExcelData excelData = PersonnelInfoExcelData.builder()
+    //             // todo 企业名称,可从companyid查询关联关系得到。
+    //             .orgname(map.get(0).toString())
+    //             // todo 统一社会信用代码,可从companyid查询关联关系得到。
+    //             .orgcode(map.get(1).toString())
+    //             // 姓名
+    //             .name(map.get(2).toString())
+    //             // 出生年月
+    //             .birthday(map.get(3).toString())
+    //             // todo 出生地,需要新增
+    //             .birthplace(map.get(4).toString())
+    //             // todo 政治面貌,需要新增
+    //             .politicallandscape(map.get(5).toString())
+    //             // 职务
+    //             .position(map.get(6).toString())
+    //             // todo 专业(研究领域)????
+    //             .domain(map.get(7).toString())
+    //             // 学历 "高中", 6701 "中专", 6702 "大专", 6703 "学士", 6704
+    //             // "硕士", 6705  "博士", 6706
+    //             // "博士后", 6707 "其他", 6708
+    //             .academicdegreename(map.get(8).toString())
+    //             // 职称
+    //             .positionaltitles(map.get(9).toString())
+    //             // 联系电话
+    //             .tel(map.get(10).toString())
+    //             // todo 现从事技术领域(多)???
+    //             .category(map.get(11).toString())
+    //             // todo 人才认定级别,需要新增
+    //             .talentidentificationlevel(map.get(12).toString())
+    //             // 主要贡献
+    //             .remark(map.get(13).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    // //人才信息(溧水节点)
+    // public static PersonnelInfoExcelDataLishui initLishuiPersonnerlHeadInfo() {
+    //     String initHead = PERSONNEL_TL_HEAD_LISHUI;
+    //     Map<Integer, Object> map = JSONObject.parseObject(initHead, Map.class);
+    //     PersonnelInfoExcelDataLishui excelData = PersonnelInfoExcelDataLishui.builder()
+    //             .orgname(map.get(0).toString())
+    //             .orgcode(map.get(1).toString())
+    //             .name(map.get(2).toString())
+    //             .sex(map.get(3).toString())
+    //             .birthday(map.get(4).toString())
+    //             .nationality(map.get(5).toString())
+    //             .birthplace(map.get(6).toString())
+    //             .nation(map.get(7).toString())
+    //             .politicallandscape(map.get(8).toString())
+    //             .tel(map.get(9).toString())
+    //             .communicateAddress(map.get(10).toString())
+    //             .domain(map.get(11).toString())
+    //             .academicdegreename(map.get(12).toString())
+    //             .isAbroad(map.get(13).toString())
+    //             .abroadState(map.get(14).toString())
+    //             .schoolname(map.get(15).toString())
+    //             .isfulltime(map.get(16).toString())
+    //             .position(map.get(17).toString())
+    //             .entryTime(map.get(18).toString())
+    //             .dimissionTime(map.get(19).toString())
+    //             .positionaltitles(map.get(20).toString())
+    //             .category(map.get(21).toString())
+    //             .talentidentificationlevel(map.get(22).toString())
+    //             .remark(map.get(23).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    // /**
+    //  * 专家信息
+    //  * @return
+    //  */
+    // public static ExpertInfoExcelData initTongluExpertHeadInfo(String nodeId) {
+    //     String initHead = null;
+    //     if ("320117400".equals(nodeId)) {
+    //         initHead = EXPERT_TL_HEAD_LISHUI;
+    //     }else if ("330122000".equals(nodeId)) {
+    //         initHead = EXPERT_TL_HEAD;
+    //     }
+    //     if (StringUtils.isNotEmpty(initHead)) {
+    //         Map<Integer, Object> map = JSONObject.parseObject(initHead, Map.class);
+    //         // 所属学校    所属院校    专家姓名    研究领域    学位(academicdegree )
+    //         // 职称(rank)  联系方式    邮箱(email  )  简介≤200字
+    //         // 关键词(输入多个标签时以“,”隔开
+    //         ExpertInfoExcelData excelData = ExpertInfoExcelData.builder()
+    //                 // 所属学校,对应oid(Companyid-->orgid)
+    //                 .school(map.get(0).toString())
+    //                 // todo 所属院校,需要新增
+    //                 .academy(map.get(1).toString())
+    //                 // 专家姓名
+    //                 .name(map.get(2).toString())
+    //                 // 研究领域
+    //                 .domain(map.get(3).toString())
+    //                 // 学位
+    //                 .academicdegreename(map.get(4).toString())
+    //                 // 职称
+    //                 .position(map.get(5).toString())
+    //                 // 联系方式
+    //                 .tel(map.get(6).toString())
+    //                 // 邮箱
+    //                 .email(map.get(7).toString())
+    //                 // 简介
+    //                 .about(map.get(8).toString())
+    //                 // 关键词
+    //                 .talentslabelname(map.get(9).toString())
+    //                 .build();
+    //         return excelData;
+    //     }
+    //     return null;
+    // }
+    //
+    // /**
+    //  * 政策库
+    //  * @return
+    //  */
+    // public static PolicyBasicInfoExcelData initTongluPolicyHeadInfo() {
+    //     String initHead = POLICY_TL_HEAD;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //     // 关键词 政策名称    政策编号    政策内容
+    //     PolicyBasicInfoExcelData excelData = PolicyBasicInfoExcelData.builder()
+    //             // todo 关键词,需要新增。
+    //             .keywords(map.get(0).toString())
+    //             // 政策名称
+    //             .title(map.get(1).toString())
+    //             // todo 政策编号,需要新增。
+    //             .policynumber(map.get(2).toString())
+    //             // 政策内容
+    //             .content(map.get(3).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    // //政策库(溧水节点)
+    // public static PolicyBasicInfoExcelDataLishui initLishuiPolicyHeadInfo() {
+    //     String initHead = POLICY_TL_HEAD_LISHUI;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead,Map.class);
+    //     PolicyBasicInfoExcelDataLishui excelData = PolicyBasicInfoExcelDataLishui.builder()
+    //             .title(map.get(0).toString())
+    //             .policyLevel(map.get(1).toString())
+    //             .policynumber(map.get(2).toString())
+    //             .content(map.get(3).toString())
+    //             .url(map.get(4).toString())
+    //             .name(map.get(5).toString())
+    //             .tel(map.get(6).toString())
+    //             .remark(map.get(7).toString())
+    //             .build();
+    //     return excelData;
+    // }
+    //
+    // /**
+    //  * 平台库
+    //  * @return
+    //  */
+    // public static PlatformInfoExcelDate initLishuiPlatformHeadInfo() {
+    //     String initHead = PLATFORM_TL_HEAD_LISHUI;
+    //     Map<Integer,Object> map = JSONObject.parseObject(initHead, Map.class);
+    //     //级别    平台名称    联系地址    孵化面积/㎡  运营单位    统一社会信用代码
+    //     //联系人   联系方式    截止目前在孵企业数量  截止目前毕业企业数量  备注  简介
+    //     PlatformInfoExcelDate platformInfoExcelDate = PlatformInfoExcelDate.builder()
+    //             .category(map.get(0).toString())
+    //             .title(map.get(1).toString())
+    //             .address(map.get(2).toString())
+    //             .factoryarea(map.get(3).toString())
+    //             .affiliatedorg(map.get(4).toString())
+    //             .code(map.get(5).toString())
+    //             .contactor(map.get(6).toString())
+    //             .tel(map.get(7).toString())
+    //             .techtype(map.get(8).toString())
+    //             .starType(map.get(9).toString())
+    //             .remark(map.get(10).toString())
+    //             .content(map.get(11).toString())
+    //             .build();
+    //     return platformInfoExcelDate;
+    // }
+    //
+    //
+    //
+    //
+    //
+    //
+    //
+    // public static void main(String[] args) {
+    //     System.out.println(POIWordUtil.processInteltype("发明实用"));
+    //     System.out.println(POIWordUtil.processInteltype("发明"));
+    //     System.out.println(POIWordUtil.processInteltype("离开"));
+    // }
 
     public static Integer checkIntelType(String intelType){
         if (intelType.equals("发明")) {

+ 1 - 1
saas-backen/src/main/resources/error.properties

@@ -14,6 +14,6 @@ get_user_info_failed=\u767B\u5F55\u5931\u8D25\uFF0C\u7528\u6237\u4FE1\u606F\u83B
 login_failure=\u767B\u5F55\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u3002
 request_org_failed=\u7EC4\u7EC7\u5217\u8868\u83B7\u53D6\u5931\u8D25\u3002
 is_relation_exist=\u6570\u636E\u5DF2\u5B58\u5728\uFF0C\u8BF7\u52FF\u91CD\u590D\u6DFB\u52A0\u3002
-qa_no_response=\u95EE\u7B54\u65E0\u54CD\u5E94,\u7B97\u6CD5\u51FA\u9519!
 illegal_argument=\u53C2\u6570\u4E0D\u5408\u6CD5!
 filename_null=\u6587\u4EF6\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A!
+error_excel_head=\u6A21\u677F\u4E0D\u4E00\u81F4\uFF0C\u8BF7\u4E0A\u4F20\u6B63\u786E\u7684\u6A21\u677F\u540E\u518D\u8BD5!