1、各字段属性调整。

saas-backen/src/main/java/com/pavis/app/saasbacken/controller/DataEntryController.java

@@ -3,6 +3,7 @@ package com.pavis.app.saasbacken.controller;
 import com.alibaba.fastjson.JSON;
 import com.pavis.app.saasbacken.aop.PreSaveLog;
 import com.pavis.app.saasbacken.exception.GlobalExceptionHandler;
+import com.pavis.app.saasbacken.form.BasicInfo;
 import com.pavis.app.saasbacken.http.ResultBody;
 import com.pavis.app.saasbacken.service.EnterpriseBasicInfoService;
 import com.pavis.app.saasbacken.utils.HttpContextUtils;
@@ -52,4 +53,18 @@ public class DataEntryController {
         }
     }
 
+    // 使用object接收。
+    @PreSaveLog("data信息")
+    @ApiOperation(value = "data信息接口", notes = "data信息接口")
+    @PostMapping("/data")
+    public ResultBody data(@RequestBody List<BasicInfo> basicInfo) {
+        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+        String uri = request.getRequestURI();
+        try {
+            log.info("orgAdd:{}", JSON.toJSONString(basicInfo));
+            return ResultBody.ok().path(uri).data(null);
+        } catch (Exception e) {
+            return GlobalExceptionHandler.resolveException(e, uri);
+        }
+    }
 }

saas-backen/src/main/java/com/pavis/app/saasbacken/dao/EnterpriseBasicInfoMapper.java

@@ -2,6 +2,7 @@ package com.pavis.app.saasbacken.dao;
 
 import com.pavis.app.saasbacken.entity.EnterpriseBasicInfo;
 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 EnterpriseBasicInfoMapper extends BaseMapper<EnterpriseBasicInfo> {
 
 }

saas-backen/src/main/java/com/pavis/app/saasbacken/dao/OrgRelPersonalMapper.java

@@ -0,0 +1,18 @@
+package com.pavis.app.saasbacken.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pavis.app.saasbacken.entity.OrgRelPersonal;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author guan
+ * @since 2021-10-29
+ */
+@Component
+public interface OrgRelPersonalMapper extends BaseMapper<OrgRelPersonal> {
+
+}

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

@@ -32,7 +32,7 @@ public class AuditInstitutionCertification extends Model<AuditInstitutionCertifi
     @TableId(value = "id", type = IdType.INPUT)
     private String id;
 
-    @ApiModelProperty(value = "关联企业id")
+    @ApiModelProperty(value = "关联企业库id")
     private String enterpriseId;
 
     @ApiModelProperty(value = "企业名称")
@@ -122,13 +122,15 @@ public class AuditInstitutionCertification extends Model<AuditInstitutionCertifi
     @ApiModelProperty(value = "政府补充信息")
     private String supplementaryGovernmentInfo;
 
-    @ApiModelProperty(value = "认证状态 0 未认证 1 已认证 2 认证中 3 认证失败")
+    //  0 未认证 1 已认证 2 认证中 3 认证失败
+    @ApiModelProperty(value = "认证状态")
     private String authenStatus;
 
-    @ApiModelProperty(value = "审核状态 0 待初审 1 审核通过 2 退回 3 拒绝")
+    //  0 待初审 1 审核通过 2 退回 3 拒绝
+    @ApiModelProperty(value = "审核状态")
     private String checkStatus;
 
-    @ApiModelProperty(value = "拒绝理由 1,2,3...")
+    @ApiModelProperty(value = "拒绝理由(1,2,3...)")
     private String refuseReason;
 
     @ApiModelProperty(value = "备注")

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

@@ -51,10 +51,12 @@ public class Category extends Model<Category> {
     @ApiModelProperty(value = "类目得所属模块")
     private String moduleId;
 
-    @ApiModelProperty(value = "类目得属性，1 基础数据 2 扩展数据")
+    // 1 基础数据 2 扩展数据
+    @ApiModelProperty(value = "类目得属性")
     private String categoryType;
 
-    @ApiModelProperty(value = "是否可用，1 使用中(默认)，2 停用。")
+    // 1 使用中(默认)，2 停用。
+    @ApiModelProperty(value = "是否可用")
     private String isEnabled;
 
     @ApiModelProperty(value = "备注")

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

@@ -59,7 +59,8 @@ public class CheckModule extends Model<CheckModule> {
     @ApiModelProperty(value = "是否排序")
     private String isSorted;
 
-    @ApiModelProperty(value = "单选：是/否，是否有二级目录")
+    // 单选：是/否，
+    @ApiModelProperty(value = "是否有二级目录")
     private String weatherChild;
 
     // input()、单选框、复选框、下拉选择、图片、是/否、是/否二级目录、

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

@@ -38,7 +38,8 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
     @ApiModelProperty(value = "企业名称")
     private String name;
 
-    @ApiModelProperty(value = "是否具有独立法人资格 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否具有独立法人资格")
     private String isIndependentLegalPersonality;
 
     @ApiModelProperty(value = "注册地址")
@@ -50,7 +51,8 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
     @ApiModelProperty(value = "联系人")
     private String contact;
 
-    @ApiModelProperty(value = "联系人电话,手机号")
+    // 电话,手机号
+    @ApiModelProperty(value = "联系人联系方式")
     private String contactTel;
 
     @ApiModelProperty(value = "统一社会信用代码")
@@ -59,10 +61,12 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
     @ApiModelProperty(value = "拟申报年份")
     private Integer declaredYear;
 
-    @ApiModelProperty(value = "所属行业领域，选择框：按工商行业信息目录")
+    // 选择框：按工商行业信息目录
+    @ApiModelProperty(value = "所属行业领域")
     private String category;
 
-    @ApiModelProperty(value = "是否已有桐庐县飞地研发中心 1 是 0 否")
+    // 1 是 0 否
+    @ApiModelProperty(value = "是否已有桐庐县飞地研发中心")
     private String isEnclave;
 
     @ApiModelProperty(value = "飞地研发中心全称")
@@ -71,10 +75,12 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
     @ApiModelProperty(value = "飞地研发中心地址")
     private String enclaveAddress;
 
-    @ApiModelProperty(value = "企业占股飞地研发中心是否超50% 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "企业占股飞地研发中心是否超50%")
     private String isEnclaveExceed;
 
-    @ApiModelProperty(value = "是否目标任务明确，与《国家重点支持的高新技术领域》紧密关联;组织架构明确，岗位责任清晰，科研活动各项规章制度健全。 优秀 良好 一般 不符合")
+    //  优秀 良好 一般 不符合
+    @ApiModelProperty(value = "是否目标任务明确，与《国家重点支持的高新技术领域》紧密关联;组织架构明确，岗位责任清晰，科研活动各项规章制度健全。")
     private String isClear;
 
     @ApiModelProperty(value = "当年企业职工总数")
@@ -83,7 +89,8 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
     @ApiModelProperty(value = "专职研究开发人员数")
     private Integer specialResearchCount;
 
-    @ApiModelProperty(value = "科技人员占企业当年职工总数的比例 自动计算相除：科技人员数/职工总数")
+    //  自动计算相除：科技人员数/职工总数
+    @ApiModelProperty(value = "科技人员占企业当年职工总数的比例")
     private Double technicalInworkerRate;
 
     @ApiModelProperty(value = "专职研究开发人员中，有中级职称以上人员数")
@@ -95,10 +102,12 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
     @ApiModelProperty(value = "专职研究开发人员中，最高学历为本科且没有中级以上职称的人员数")
     private Integer masterNotIntermediateCount;
 
-    @ApiModelProperty(value = "专职研究开发人员是否在研发中心从事研发工作183天以上 1 是，0 否")
+    //  1 是，0 否
+    @ApiModelProperty(value = "专职研究开发人员是否在研发中心从事研发工作183天以上")
     private String isResearchDayExceed;
 
-    @ApiModelProperty(value = "专职研究开发人员是否从事相关工作不少于2年 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "专职研究开发人员是否从事相关工作不少于2年")
     private String isResearchYearExceed;
 
     @ApiModelProperty(value = "上年度Ⅰ类知识产权数")
@@ -127,8 +136,8 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
 
     @ApiModelProperty(value = "上年度研究开发费用")
     private Double lastResearchBill;
-
-    @ApiModelProperty(value = "研发投入占企业年销售收入总额 系统自动计算:上年度研发投入/上年度销售收入")
+    // 系统自动计算:上年度研发投入/上年度销售收入
+    @ApiModelProperty(value = "研发投入占企业年销售收入总额")
     private Double researchSaleRate;
 
     @ApiModelProperty(value = "上一年度专职研究开发人员平均薪金")
@@ -140,10 +149,12 @@ public class EnclaveResearchDevCenterCheck extends Model<EnclaveResearchDevCente
     @ApiModelProperty(value = "科研设备原值总额")
     private Double researchEquipmentTotal;
 
-    @ApiModelProperty(value = "是否具有相对独立地位，运行满1年。若具有独立法人资格的，申报主体是否占该飞地研发中心50%以上股份。 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否具有相对独立地位，运行满1年。若具有独立法人资格的，申报主体是否占该飞地研发中心50%以上股份。")
     private String isIndependent;
 
-    @ApiModelProperty(value = "申报前一年度内，未列入严重失信名单 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "申报前一年度内，未列入严重失信名单")
     private String isBrokenPromisesList;
 
     @ApiModelProperty(value = "备注")

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

@@ -44,10 +44,11 @@ public class EnclaveResearchDevCenterReport extends Model<EnclaveResearchDevCent
     @ApiModelProperty(value = "关联自检库id")
     private String cultivateId;
 
-    @ApiModelProperty(value = "是否满足条件 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否满足条件")
     private String isProposal;
 
-    @ApiModelProperty(value = "不建议申报得原因，1,2,3,...")
+    @ApiModelProperty(value = "不建议申报得原因(1,2,3,...)")
     private String drawback;
 
     @ApiModelProperty(value = "备注")

saas-backen/src/main/java/com/pavis/app/saasbacken/entity/EnterpriseBasicInfo.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,6 +23,10 @@ import java.util.Date;
 @Accessors(chain = true)
 @TableName("enterprise_basic_info")
 @ApiModel(value="EnterpriseBasicInfo对象", description="")
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
 public class EnterpriseBasicInfo extends Model<EnterpriseBasicInfo> {
 
     private static final long serialVersionUID = 1L;
@@ -84,6 +87,9 @@ public class EnterpriseBasicInfo extends Model<EnterpriseBasicInfo> {
     @ApiModelProperty(value = "机构类型")
     private String resType;
 
+    @ApiModelProperty(value = "研发机构等级")
+    private String devOrgLevel;
+
     @ApiModelProperty(value = "营业期限")
     private String businessTerm;
 
@@ -99,6 +105,12 @@ public class EnterpriseBasicInfo extends Model<EnterpriseBasicInfo> {
     @ApiModelProperty(value = "经营范围")
     private String businessScope;
 
+    @ApiModelProperty(value = "经营状态")
+    private String businessStatus;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
     @ApiModelProperty(value = "官网")
     private String website;
 
@@ -108,7 +120,7 @@ public class EnterpriseBasicInfo extends Model<EnterpriseBasicInfo> {
     @ApiModelProperty(value = "是否规上")
     private String isGauge;
 
-    @ApiModelProperty(value = "资质信息")
+    @ApiModelProperty(value = "企业资质")
     private String qualifyInfo;
 
     @ApiModelProperty(value = "企业简介")
@@ -144,6 +156,12 @@ public class EnterpriseBasicInfo extends Model<EnterpriseBasicInfo> {
     @ApiModelProperty(value = "科技联络人信息关联id")
     private String technicalDirectorId;
 
+    @ApiModelProperty(value = "图片")
+    private String img;
+
+    @ApiModelProperty(value = "关键词")
+    private String keywords;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 

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

@@ -47,13 +47,14 @@ public class HighSelfCheck extends Model<HighSelfCheck> {
     @ApiModelProperty(value = "联系人电话,手机号")
     private String contactTel;
 
-    @ApiModelProperty(value = "技术合同id与technical_contract的id对应")
+    @ApiModelProperty(value = "技术合同关联id")
     private String contractid;
 
     @ApiModelProperty(value = "统一社会信用代码")
     private String unifySocialCreditCode;
 
-    @ApiModelProperty(value = "产业领域，八大领域自选")
+    // ，八大领域自选
+    @ApiModelProperty(value = "产业领域")
     private String category;
 
     @ApiModelProperty(value = "职工总数")
@@ -65,7 +66,7 @@ public class HighSelfCheck extends Model<HighSelfCheck> {
     @ApiModelProperty(value = "拟申报年份")
     private Integer declaredYear;
 
-    @ApiModelProperty(value = "科技人员占全部职工比例数据 自动计算")
+    @ApiModelProperty(value = "科技人员占全部职工比例数据")
     private Double technicalInworkerRate;
 
     @ApiModelProperty(value = "I类自主知识产权数")

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

@@ -47,13 +47,14 @@ public class HighSelfCheckInfo extends Model<HighSelfCheckInfo> {
     @ApiModelProperty(value = "联系人电话,手机号")
     private String contactTel;
 
-    @ApiModelProperty(value = "技术合同id与technical_contract的id对应")
+    @ApiModelProperty(value = "技术合同关联id")
     private String contractid;
 
     @ApiModelProperty(value = "统一社会信用代码")
     private String unifySocialCreditCode;
 
-    @ApiModelProperty(value = "产业领域，八大领域自选")
+    // 八大领域自选
+    @ApiModelProperty(value = "产业领域")
     private String category;
 
     @ApiModelProperty(value = "职工总数")
@@ -65,7 +66,7 @@ public class HighSelfCheckInfo extends Model<HighSelfCheckInfo> {
     @ApiModelProperty(value = "拟申报年份")
     private Integer declaredYear;
 
-    @ApiModelProperty(value = "科技人员占全部职工比例数据 自动计算")
+    @ApiModelProperty(value = "科技人员占全部职工比例数据")
     private Double technicalInworkerRate;
 
     @ApiModelProperty(value = "I类自主知识产权数")

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

@@ -44,10 +44,11 @@ public class HighSelfReport extends Model<HighSelfReport> {
     @ApiModelProperty(value = "关联自检库id")
     private String cultivateId;
 
-    @ApiModelProperty(value = "是否满足条件 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否满足条件")
     private String isProposal;
 
-    @ApiModelProperty(value = "不建议申报得原因，1,2,3,...")
+    @ApiModelProperty(value = "不建议申报得原因(1,2,3,...)")
     private String drawback;
 
     @ApiModelProperty(value = "备注")

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

@@ -122,13 +122,15 @@ public class IntermediaryInstitutionCertification extends Model<IntermediaryInst
     @ApiModelProperty(value = "政府补充信息")
     private String supplementaryGovernmentInfo;
 
-    @ApiModelProperty(value = "认证状态 0 未认证 1 已认证 2 认证中 3 认证失败")
+    //  0 未认证 1 已认证 2 认证中 3 认证失败
+    @ApiModelProperty(value = "认证状态")
     private String authenStatus;
 
-    @ApiModelProperty(value = "审核状态 0 待初审 1 审核通过 2 退回 3 拒绝")
+    //  0 待初审 1 审核通过 2 退回 3 拒绝
+    @ApiModelProperty(value = "审核状态")
     private String checkStatus;
 
-    @ApiModelProperty(value = "拒绝理由 1,2,3...")
+    @ApiModelProperty(value = "拒绝理由(1,2,3...)")
     private String refuseReason;
 
     @ApiModelProperty(value = "备注")

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

@@ -41,7 +41,7 @@ public class IntermediaryInstitutionLib extends Model<IntermediaryInstitutionLib
     @ApiModelProperty(value = "企业logo")
     private String logo;
 
-    @ApiModelProperty(value = "关联中介认证库id，认证通过后更新id至此")
+    @ApiModelProperty(value = "关联中介认证库id")
     private String authenId;
 
     @ApiModelProperty(value = "备注")

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

@@ -38,7 +38,8 @@ public class MunicipalResearchCenterCheck extends Model<MunicipalResearchCenterC
     @ApiModelProperty(value = "企业名称")
     private String name;
 
-    @ApiModelProperty(value = "注册地址 选择框 选择杭州市，非杭州市")
+    //  选择框 选择杭州市，非杭州市
+    @ApiModelProperty(value = "注册地址")
     private String registerAddress;
 
     @ApiModelProperty(value = "注册日期")
@@ -116,7 +117,8 @@ public class MunicipalResearchCenterCheck extends Model<MunicipalResearchCenterC
     @ApiModelProperty(value = "是否财务实行单独建账核算，所需经费纳入建设企业财务年度预算 1 是，0 否")
     private String isIndependentBill;
 
-    @ApiModelProperty(value = "科研活动各项规章制度是否健全 1 是，0 否")
+    //  1 是，0 否
+    @ApiModelProperty(value = "科研活动各项规章制度是否健全")
     private String isScientificResearchSound;
 
     @ApiModelProperty(value = "科研场地面积")
@@ -125,16 +127,18 @@ public class MunicipalResearchCenterCheck extends Model<MunicipalResearchCenterC
     @ApiModelProperty(value = "专用科研设备原值总额")
     private Double researchEquipmentTotal;
 
-    @ApiModelProperty(value = "企业、高校或科研机构是否联合组建中心 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "企业、高校或科研机构是否联合组建中心")
     private String isJointCenter;
 
-    @ApiModelProperty(value = "组建中心设施总值 若有 则填写")
+    @ApiModelProperty(value = "组建中心设施总值")
     private Double centerFacilitiesTotal;
 
     @ApiModelProperty(value = "企业专用科研设备原值总额占比 系统自动计算：专用科研设备原值总额/组建中心设施总值")
     private Double proportionEquipCenterRate;
 
-    @ApiModelProperty(value = "企业近3年来未发生重大安全事故、重大质量事故、严重环境违法行为或严重失信行为等行为 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "企业近3年来未发生重大安全事故、重大质量事故、严重环境违法行为或严重失信行为等行为")
     private String isOccurredBad;
 
     @ApiModelProperty(value = "备注")

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

@@ -44,10 +44,11 @@ public class MunicipalResearchCenterReport extends Model<MunicipalResearchCenter
     @ApiModelProperty(value = "关联自检库id")
     private String cultivateId;
 
-    @ApiModelProperty(value = "是否满足条件 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否满足条件")
     private String isProposal;
 
-    @ApiModelProperty(value = "不建议申报得原因，1,2,3,...")
+    @ApiModelProperty(value = "不建议申报得原因(1,2,3,...)")
     private String drawback;
 
     @ApiModelProperty(value = "备注")

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

@@ -0,0 +1,117 @@
+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.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 资源库与人员信息关联关系表
+ * </p>
+ *
+ * @author guan
+ * @since 2021-10-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("org_rel_personal")
+@ApiModel(value="OrgRelPersonal对象", description="资源库与人员信息关联关系表")
+@Builder
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+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)
+    private String id;
+
+    @ApiModelProperty(value = "资源库类型")
+    private String resType;
+
+    @ApiModelProperty(value = "关系类型")
+    private String relType;
+
+    @ApiModelProperty(value = "关联企业基本信息主键id")
+    private String enterpriseId;
+
+    @ApiModelProperty(value = "关联人员信息主键id")
+    private String personalId;
+
+    @ApiModelProperty(value = "人员信息姓名")
+    private String name;
+
+    @ApiModelProperty(value = "人员信息联系方式")
+    private String contacts;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "预留字段1")
+    private String by1;
+
+    @ApiModelProperty(value = "预留字段2")
+    private String by2;
+
+    @ApiModelProperty(value = "预留字段3")
+    private String by3;
+
+    @ApiModelProperty(value = "预留字段4")
+    private String by4;
+
+    @ApiModelProperty(value = "预留字段5")
+    private String by5;
+
+    @ApiModelProperty(value = "预留字段6")
+    private String by6;
+
+    @ApiModelProperty(value = "预留字段7")
+    private String by7;
+
+    @ApiModelProperty(value = "预留字段8")
+    private String by8;
+
+    @ApiModelProperty(value = "预留字段9")
+    private String by9;
+
+    @ApiModelProperty(value = "预留字段10")
+    private String by10;
+
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "创建时间")
+    // private String createTime;
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建者")
+    private Long creator;
+
+    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+    @ApiModelProperty(value = "更新时间")
+    // private String updateTime;
+    private Date updateTime;
+
+    @ApiModelProperty(value = "更新者")
+    private Long updator;
+
+    @TableField(exist = false)
+    private String tablename = "org_rel_personal";
+
+    @TableField(exist = false)
+    private Integer tablecode;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -4,9 +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.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
@@ -26,6 +24,10 @@ import java.util.Date;
 @TableName("personal_info")
 @ApiModel(value="PersonalInfo对象", description="")
 @Builder
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
 public class PersonalInfo extends Model<PersonalInfo> {
 
     private static final long serialVersionUID = 1L;
@@ -37,7 +39,8 @@ public class PersonalInfo extends Model<PersonalInfo> {
     @ApiModelProperty(value = "企业/高校基本信息关联id")
     private String enterpriseId;
 
-    @ApiModelProperty(value = "人才类型 (1 专家 2 )")
+    //  (1 专家 2 ...)
+    @ApiModelProperty(value = "人才类型")
     private String talentType;
 
     @ApiModelProperty(value = "所属单位/所属院校")
@@ -46,7 +49,8 @@ public class PersonalInfo extends Model<PersonalInfo> {
     @ApiModelProperty(value = "姓名")
     private String name;
 
-    @ApiModelProperty(value = "性别 0 未选择 1 男 2 女")
+    //  0 未选择 1 男 2 女
+    @ApiModelProperty(value = "性别")
     private String sex;
 
     @ApiModelProperty(value = "出生年月")
@@ -82,7 +86,8 @@ public class PersonalInfo extends Model<PersonalInfo> {
     @ApiModelProperty(value = "学位")
     private String degree;
 
-    @ApiModelProperty(value = "是否留学 1 是 0 否 -1 未选择")
+    //  1 是 0 否 -1 未选择
+    @ApiModelProperty(value = "是否留学")
     private String isStudyAbroad;
 
     @ApiModelProperty(value = "留学国家")
@@ -91,7 +96,8 @@ public class PersonalInfo extends Model<PersonalInfo> {
     @ApiModelProperty(value = "留学学校名称")
     private String overseasSchoolName;
 
-    @ApiModelProperty(value = " 是否全日制 1 是 0 否 -1 未选择")
+    //  1 是 0 否 -1 未选择
+    @ApiModelProperty(value = " 是否全日制")
     private String isFullTime;
 
     @ApiModelProperty(value = "企业岗位")
@@ -106,7 +112,7 @@ public class PersonalInfo extends Model<PersonalInfo> {
     @ApiModelProperty(value = "职称")
     private String title;
 
-    @ApiModelProperty(value = "职位，岗位")
+    @ApiModelProperty(value = "职位/岗位")
     private String dutyJob;
 
     @ApiModelProperty(value = "联系方式")

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

@@ -33,7 +33,8 @@ public class PotentialLibrary extends Model<PotentialLibrary> {
     @TableId(value = "id", type = IdType.INPUT)
     private String id;
 
-    @ApiModelProperty(value = "潜力类型 1 国高 2 省科小 3雏鹰 4 市级研发中心 5 省级研发中心 6 省级研究院 7 飞地研发中心")
+    //  1 国高 2 省科小 3雏鹰 4 市级研发中心 5 省级研发中心 6 省级研究院 7 飞地研发中心
+    @ApiModelProperty(value = "潜力类型")
     private String potentialType;
 
     @ApiModelProperty(value = "关联企业id")

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

@@ -38,7 +38,8 @@ public class ProvinceEnterpriseResearchCheck extends Model<ProvinceEnterpriseRes
     @ApiModelProperty(value = "企业名称")
     private String name;
 
-    @ApiModelProperty(value = "注册地址 选择框 选择浙江省，非浙江市")
+    // 选择框 选择浙江省，非浙江市
+    @ApiModelProperty(value = "注册地址")
     private String registerAddress;
 
     @ApiModelProperty(value = "注册日期")
@@ -47,10 +48,10 @@ public class ProvinceEnterpriseResearchCheck extends Model<ProvinceEnterpriseRes
     @ApiModelProperty(value = "联系人")
     private String contact;
 
-    @ApiModelProperty(value = "联系人电话,手机号")
+    @ApiModelProperty(value = "联系人电话/手机号")
     private String contactTel;
 
-    @ApiModelProperty(value = "技术合同id与technical_contract的id对应")
+    @ApiModelProperty(value = "技术合同关联id")
     private String contractid;
 
     @ApiModelProperty(value = "统一社会信用代码")
@@ -59,7 +60,8 @@ public class ProvinceEnterpriseResearchCheck extends Model<ProvinceEnterpriseRes
     @ApiModelProperty(value = "拟申报年份")
     private Integer declaredYear;
 
-    @ApiModelProperty(value = "所属行业领域，选择框：按工商行业信息目录")
+    // 选择框：按工商行业信息目录
+    @ApiModelProperty(value = "所属行业领域")
     private String category;
 
     @ApiModelProperty(value = "当年企业职工总数")
@@ -68,16 +70,19 @@ public class ProvinceEnterpriseResearchCheck extends Model<ProvinceEnterpriseRes
     @ApiModelProperty(value = "专职研究开发人员数")
     private Integer specialResearchCount;
 
-    @ApiModelProperty(value = "科技人员占企业当年职工总数的比例 自动计算相除：科技人员数/职工总数")
+    // 自动计算相除：科技人员数/职工总数
+    @ApiModelProperty(value = "科技人员占企业当年职工总数的比例")
     private Double technicalInworkerRate;
 
     @ApiModelProperty(value = "本科以上学历或中级以上职称的工程技术人员数")
     private Double engineerTechCount;
 
-    @ApiModelProperty(value = "具有本科以上学历或中级以上职称的工程技术人员占研发机构职工总数 自动计算：本科以上学历或中级以上职称的工程技术人员数/专职研究开发人员数")
+    //  自动计算：本科以上学历或中级以上职称的工程技术人员数/专职研究开发人员数
+    @ApiModelProperty(value = "具有本科以上学历或中级以上职称的工程技术人员占研发机构职工总数")
     private Double engineerResearchRate;
 
-    @ApiModelProperty(value = "是否建有省级高新技术企业研发中心 1 是 2 否")
+    //  1 是 2 否
+    @ApiModelProperty(value = "是否建有省级高新技术企业研发中心")
     private String isProvinceResearch;
 
     @ApiModelProperty(value = "I类自主知识产权数")
@@ -86,7 +91,8 @@ public class ProvinceEnterpriseResearchCheck extends Model<ProvinceEnterpriseRes
     @ApiModelProperty(value = "II类自主知识产权数")
     private Integer intellectualCountTwo;
 
-    @ApiModelProperty(value = "知识产权获得方式 有选择框，企业选择（有自主研发；仅有受让、受赠和并购等")
+    //  有选择框，企业选择（有自主研发；仅有受让、受赠和并购等
+    @ApiModelProperty(value = "知识产权获得方式")
     private String obtainIntellectualWay;
 
     @ApiModelProperty(value = "上年度销售收入")
@@ -95,7 +101,8 @@ public class ProvinceEnterpriseResearchCheck extends Model<ProvinceEnterpriseRes
     @ApiModelProperty(value = "上年度研究开发费用")
     private Double lastResearchBill;
 
-    @ApiModelProperty(value = "研发投入占企业年销售收入总额 系统自动计算:上年度研发投入/上年度销售收入")
+    //  系统自动计算:上年度研发投入/上年度销售收入
+    @ApiModelProperty(value = "研发投入占企业年销售收入总额")
     private Double researchSaleRate;
 
     @ApiModelProperty(value = "研发场地面积")
@@ -104,7 +111,8 @@ public class ProvinceEnterpriseResearchCheck extends Model<ProvinceEnterpriseRes
     @ApiModelProperty(value = "科研设备原值总额")
     private Double researchEquipmentTotal;
 
-    @ApiModelProperty(value = "企业申请认定前一年度至申请之日内是否发生重大的安全、质量事故，严重的环境违法、知识产权违法、税务违法、科研失信等行为 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "企业申请认定前一年度至申请之日内是否发生重大的安全、质量事故，严重的环境违法、知识产权违法、税务违法、科研失信等行为")
     private String isOccurredBad;
 
     @ApiModelProperty(value = "备注")

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

@@ -38,7 +38,8 @@ public class ProvincialResearchCenterCheck extends Model<ProvincialResearchCente
     @ApiModelProperty(value = "企业名称")
     private String name;
 
-    @ApiModelProperty(value = "注册地址 选择框 选择浙江省，非浙江省")
+    //  选择框 选择浙江省，非浙江省
+    @ApiModelProperty(value = "注册地址")
     private String registerAddress;
 
     @ApiModelProperty(value = "注册日期")
@@ -47,7 +48,7 @@ public class ProvincialResearchCenterCheck extends Model<ProvincialResearchCente
     @ApiModelProperty(value = "联系人")
     private String contact;
 
-    @ApiModelProperty(value = "联系人电话,手机号")
+    @ApiModelProperty(value = "联系人电话/手机号")
     private String contactTel;
 
     @ApiModelProperty(value = "统一社会信用代码")
@@ -56,7 +57,8 @@ public class ProvincialResearchCenterCheck extends Model<ProvincialResearchCente
     @ApiModelProperty(value = "拟申报年份")
     private Integer declaredYear;
 
-    @ApiModelProperty(value = "所属行业领域，选择框：按工商行业信息目录")
+    // 选择框：按工商行业信息目录
+    @ApiModelProperty(value = "所属行业领域")
     private String category;
 
     @ApiModelProperty(value = "当年企业职工总数")
@@ -65,16 +67,19 @@ public class ProvincialResearchCenterCheck extends Model<ProvincialResearchCente
     @ApiModelProperty(value = "专职研究开发人员数")
     private Integer specialResearchCount;
 
-    @ApiModelProperty(value = "科技人员占全部职工比例数据 自动计算相除：科技人员数/职工总数")
+    //  自动计算相除：科技人员数/职工总数
+    @ApiModelProperty(value = "科技人员占全部职工比例数据")
     private Double technicalInworkerRate;
 
     @ApiModelProperty(value = "本科以上学历或中级以上职称的工程技术人员数")
     private Double engineerTechCount;
 
-    @ApiModelProperty(value = "具有本科以上学历或中级以上职称的工程技术人员占研发机构职工总数 自动计算：本科以上学历或中级以上职称的工程技术人员数/专职研究开发人员数")
+    //  自动计算：本科以上学历或中级以上职称的工程技术人员数/专职研究开发人员数
+    @ApiModelProperty(value = "具有本科以上学历或中级以上职称的工程技术人员占研发机构职工总数")
     private Double engineerResearchRate;
 
-    @ApiModelProperty(value = "是否建有市级高新技术企业研发中心 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否建有市级高新技术企业研发中心")
     private String isMunicipalResearch;
 
     @ApiModelProperty(value = "近三年累计转化科技成果")
@@ -98,7 +103,8 @@ public class ProvincialResearchCenterCheck extends Model<ProvincialResearchCente
     @ApiModelProperty(value = "软件著作权等(不含商标)")
     private Integer softwareCopyrightCount;
 
-    @ApiModelProperty(value = "知识产权获得方式 有选择框，企业选择（有自主研发；仅有受让、受赠和并购等")
+    // 有选择框，企业选择（有自主研发；仅有受让、受赠和并购等
+    @ApiModelProperty(value = "知识产权获得方式")
     private String obtainIntellectualWay;
 
     @ApiModelProperty(value = "上年度销售收入")
@@ -107,7 +113,8 @@ public class ProvincialResearchCenterCheck extends Model<ProvincialResearchCente
     @ApiModelProperty(value = "上年度研究开发费用")
     private Double lastResearchBill;
 
-    @ApiModelProperty(value = "研发投入占企业年销售收入总额 系统自动计算:上年度研发投入/上年度销售收入")
+    // 系统自动计算:上年度研发投入/上年度销售收入
+    @ApiModelProperty(value = "研发投入占企业年销售收入总额")
     private Double researchSaleRate;
 
     @ApiModelProperty(value = "研发场地面积")
@@ -119,13 +126,16 @@ public class ProvincialResearchCenterCheck extends Model<ProvincialResearchCente
     @ApiModelProperty(value = "科研生产共用的设备原值")
     private Double researchDevPulicTotal;
 
-    @ApiModelProperty(value = "科研生产共用的设备原值占比 系统自动计算：科研生产共用的设备原值总额/科研设备原值总额")
+    // 系统自动计算：科研生产共用的设备原值总额/科研设备原值总额
+    @ApiModelProperty(value = "科研生产共用的设备原值占比")
     private Double researchDevPulicRate;
 
-    @ApiModelProperty(value = "建立完整规范的技术创新管理体制 1 是 0 否")
+    // 1 是 0 否
+    @ApiModelProperty(value = "建立完整规范的技术创新管理体制")
     private String isCompleteManagement;
 
-    @ApiModelProperty(value = "企业申请认定前一年度至申请之日内是否发生重大的安全、质量事故，严重的环境违法、知识产权违法、税务违法、科研失信等行为 1 是 0 否")
+    // 1 是 0 否
+    @ApiModelProperty(value = "企业申请认定前一年度至申请之日内是否发生重大的安全、质量事故，严重的环境违法、知识产权违法、税务违法、科研失信等行为")
     private String isOccurredBad;
 
     @ApiModelProperty(value = "备注")

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

@@ -44,10 +44,11 @@ public class ProvincialResearchCenterReport extends Model<ProvincialResearchCent
     @ApiModelProperty(value = "关联自检库id")
     private String cultivateId;
 
-    @ApiModelProperty(value = "是否满足条件 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否满足条件")
     private String isProposal;
 
-    @ApiModelProperty(value = "不建议申报得原因，1,2,3,...")
+    @ApiModelProperty(value = "不建议申报得原因(1,2,3,...)")
     private String drawback;
 
     @ApiModelProperty(value = "备注")

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

@@ -38,7 +38,8 @@ public class ProvincialTechnologySmallCheck extends Model<ProvincialTechnologySm
     @ApiModelProperty(value = "企业名称")
     private String name;
 
-    @ApiModelProperty(value = "注册地址 选择框 选择杭州市，非杭州市")
+    // 选择框 选择杭州市，非杭州市
+    @ApiModelProperty(value = "注册地址")
     private String registerAddress;
 
     @ApiModelProperty(value = "注册日期")
@@ -47,7 +48,7 @@ public class ProvincialTechnologySmallCheck extends Model<ProvincialTechnologySm
     @ApiModelProperty(value = "联系人")
     private String contact;
 
-    @ApiModelProperty(value = "联系人电话,手机号")
+    @ApiModelProperty(value = "联系人电话/手机号")
     private String contactTel;
 
     @ApiModelProperty(value = "统一社会信用代码")
@@ -56,7 +57,8 @@ public class ProvincialTechnologySmallCheck extends Model<ProvincialTechnologySm
     @ApiModelProperty(value = "拟申报年份")
     private Integer declaredYear;
 
-    @ApiModelProperty(value = "所属行业领域，企业选择按工商行业信息目录")
+    // ，企业选择按工商行业信息目录
+    @ApiModelProperty(value = "所属行业领域")
     private String category;
 
     @ApiModelProperty(value = "职工总数")
@@ -65,7 +67,8 @@ public class ProvincialTechnologySmallCheck extends Model<ProvincialTechnologySm
     @ApiModelProperty(value = "科技人员数")
     private Integer technicalCount;
 
-    @ApiModelProperty(value = "科技人员占企业当年职工总数的比例 自动计算: 科技人员数/职工总数")
+    // 自动计算: 科技人员数/职工总数
+    @ApiModelProperty(value = "科技人员占企业当年职工总数的比例")
     private Double technicalInworkerRate;
 
     @ApiModelProperty(value = "知识产权总数")
@@ -86,13 +89,16 @@ public class ProvincialTechnologySmallCheck extends Model<ProvincialTechnologySm
     @ApiModelProperty(value = "其他")
     private Integer otherCount;
 
-    @ApiModelProperty(value = "知识产权获得方式 企业选择：有自主研发；仅有受让、受赠和并购等")
+    //  企业选择：有自主研发；仅有受让、受赠和并购等
+    @ApiModelProperty(value = "知识产权获得方式")
     private String obtainIntellectualWay;
 
-    @ApiModelProperty(value = "是否有基于自主知识产权、专有技术或先进知识获得的产品或服务 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否有基于自主知识产权、专有技术或先进知识获得的产品或服务")
     private String isIndependentAdvancedService;
 
-    @ApiModelProperty(value = "持续开展科技创新活动的能力 高、较高、一般、较低、无")
+    // 高、较高、一般、较低、无
+    @ApiModelProperty(value = "持续开展科技创新活动的能力")
     private String carryScientificAbility;
 
     @ApiModelProperty(value = "上年度销售收入")
@@ -101,10 +107,12 @@ public class ProvincialTechnologySmallCheck extends Model<ProvincialTechnologySm
     @ApiModelProperty(value = "上年度研发投入")
     private Double lastResearchInput;
 
-    @ApiModelProperty(value = "是否独立核算、自主经营、自负盈亏 1 是，0 否")
+    //  1 是，0 否
+    @ApiModelProperty(value = "是否独立核算、自主经营、自负盈亏")
     private String isIndependent;
 
-    @ApiModelProperty(value = "企业上年度是否发生重大安全事故、重大质量事故、严重环境违法行为或严重失信行为 1 是 0 否")
+    // 1 是 0 否
+    @ApiModelProperty(value = "企业上年度是否发生重大安全事故、重大质量事故、严重环境违法行为或严重失信行为")
     private String isOccurredBad;
 
     @ApiModelProperty(value = "备注")

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

@@ -44,10 +44,11 @@ public class ProvincialTechnologySmallReport extends Model<ProvincialTechnologyS
     @ApiModelProperty(value = "关联自检库id")
     private String cultivateId;
 
-    @ApiModelProperty(value = "是否满足条件 1 是 0 否")
+    //  1 是 0 否
+    @ApiModelProperty(value = "是否满足条件")
     private String isProposal;
 
-    @ApiModelProperty(value = "不建议申报得原因，1,2,3,...")
+    @ApiModelProperty(value = "不建议申报得原因(1,2,3,...)")
     private String drawback;
 
     @ApiModelProperty(value = "备注")

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

@@ -62,7 +62,8 @@ public class ResearchAchievementInfo extends Model<ResearchAchievementInfo> {
     @ApiModelProperty(value = "研究人员")
     private String researcher;
 
-    @ApiModelProperty(value = "是否有知识产权 1 是 0 否 -1 未选择")
+    //  1 是 0 否 -1 未选择
+    @ApiModelProperty(value = "是否有知识产权")
     private String hasIntellectualPropertyRights;
 
     @ApiModelProperty(value = "成果描述 <=200字")

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

@@ -35,7 +35,8 @@ public class ServiceItermOne extends Model<ServiceItermOne> {
     @ApiModelProperty(value = "关联中介机构id")
     private String serviceId;
 
-    @ApiModelProperty(value = "服务事项type 1 中介机构 2 审计机构")
+    //  1 中介机构 2 审计机构
+    @ApiModelProperty(value = "服务事项type")
     private String serviceType;
 
     @ApiModelProperty(value = "服务事项一级目录名称")

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

@@ -38,7 +38,8 @@ public class YoungEaglesCheck extends Model<YoungEaglesCheck> {
     @ApiModelProperty(value = "企业名称")
     private String name;
 
-    @ApiModelProperty(value = "注册地址 选择框 选择杭州市，非杭州市")
+    //  选择框 选择杭州市，非杭州市
+    @ApiModelProperty(value = "注册地址")
     private String registerAddress;
 
     @ApiModelProperty(value = "注册日期")
@@ -47,7 +48,7 @@ public class YoungEaglesCheck extends Model<YoungEaglesCheck> {
     @ApiModelProperty(value = "联系人")
     private String contact;
 
-    @ApiModelProperty(value = "联系人电话,手机号")
+    @ApiModelProperty(value = "联系人电话/手机号")
     private String contactTel;
 
     @ApiModelProperty(value = "统一社会信用代码")
@@ -56,7 +57,8 @@ public class YoungEaglesCheck extends Model<YoungEaglesCheck> {
     @ApiModelProperty(value = "拟申报年份")
     private Integer declaredYear;
 
-    @ApiModelProperty(value = "所属行业领域，八大领域自选")
+    // 八大领域自选
+    @ApiModelProperty(value = "所属行业领域")
     private String category;
 
     @ApiModelProperty(value = "上年度职工总数")
@@ -65,7 +67,8 @@ public class YoungEaglesCheck extends Model<YoungEaglesCheck> {
     @ApiModelProperty(value = "科技人员数")
     private Integer technicalCount;
 
-    @ApiModelProperty(value = "科技人员占企业当年职工数的比例 自动计算：科技人员数/职工总数")
+    // 自动计算：科技人员数/职工总数
+    @ApiModelProperty(value = "科技人员占企业当年职工数的比例")
     private Double technicalInworkerRate;
 
     @ApiModelProperty(value = "I类知识产权数")
@@ -83,16 +86,19 @@ public class YoungEaglesCheck extends Model<YoungEaglesCheck> {
     @ApiModelProperty(value = "外观设计专利数")
     private Integer appearancePatentCount;
 
-    @ApiModelProperty(value = "知识产权获得方式 选择框：有自主研发；仅有受让、受赠和并购等")
+    // 选择框：有自主研发；仅有受让、受赠和并购等
+    @ApiModelProperty(value = "知识产权获得方式")
     private String obtainIntellectualWay;
 
-    @ApiModelProperty(value = "技术的先进程度 选择框：高、较高、一般、较低、无")
+    // 选择框：高、较高、一般、较低、无
+    @ApiModelProperty(value = "技术的先进程度")
     private String technicalAdvanced;
-
-    @ApiModelProperty(value = "对企业产品（服务）在技术上发挥支持的作用 选择框：高、较高、一般、较低、无")
+    // 选择框：高、较高、一般、较低、无
+    @ApiModelProperty(value = "对企业产品（服务）在技术上发挥支持的作用")
     private String coreSupport;
 
-    @ApiModelProperty(value = "企业研发经费是否单独建账 1 是 0 否")
+    // 1 是 0 否
+    @ApiModelProperty(value = "企业研发经费是否单独建账")
     private String isSeparateBill;
 
     @ApiModelProperty(value = "上年度销售收入")
@@ -101,13 +107,14 @@ public class YoungEaglesCheck extends Model<YoungEaglesCheck> {
     @ApiModelProperty(value = "上年度研发投入")
     private Double lastResearchIncome;
 
-    @ApiModelProperty(value = "上年度的研究开发费用总额占同期销售收入总额的比例 自动计算：上年度研发投入/上年度销售收入")
+    // 自动计算：上年度研发投入/上年度销售收入
+    @ApiModelProperty(value = "上年度的研究开发费用总额占同期销售收入总额的比例")
     private Double researchSaleIncomeRate;
-
-    @ApiModelProperty(value = "在6年以内，是否具有良好的成长性 1 是，0 否")
+    // 1 是，0 否
+    @ApiModelProperty(value = "在6年以内，是否具有良好的成长性")
     private String isGoodGrowth;
-
-    @ApiModelProperty(value = "申请认定前一年内是否发生重大安全事故、重大质量事故、严重环境违法行为或严重失信行为 1 是 0 否")
+    // 1 是 0 否
+    @ApiModelProperty(value = "申请认定前一年内是否发生重大安全事故、重大质量事故、严重环境违法行为或严重失信行为")
     private String isOccurredBad;
 
     @ApiModelProperty(value = "备注")

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

@@ -44,10 +44,11 @@ public class YoungEaglesReport extends Model<YoungEaglesReport> {
     @ApiModelProperty(value = "关联自检库id")
     private String cultivateId;
 
-    @ApiModelProperty(value = "是否满足条件 1 是 0 否")
+    // 1 是 0 否
+    @ApiModelProperty(value = "是否满足条件")
     private String isProposal;
 
-    @ApiModelProperty(value = "不建议申报得原因，1,2,3,...")
+    @ApiModelProperty(value = "不建议申报得原因(1,2,3,...)")
     private String drawback;
 
     @ApiModelProperty(value = "备注")

saas-backen/src/main/java/com/pavis/app/saasbacken/form/BasicInfo.java

@@ -2,7 +2,7 @@ package com.pavis.app.saasbacken.form;
 
 import com.pavis.app.saasbacken.entity.EnterpriseBasicInfo;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
+import lombok.*;
 
 /**
  * @program: push-saas
@@ -11,13 +11,17 @@ import lombok.Builder;
  * @created: 2021/11/24 15:50
  */
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
 public class BasicInfo extends EnterpriseBasicInfo {
 
-    @ApiModelProperty(value = "主键自增id")
-    private String id;
+    // @ApiModelProperty(value = "主键自增id")
+    // private String id;
 
-    @ApiModelProperty(value = "企业联系人姓名")
-    private String contacts;
+    // @ApiModelProperty(value = "企业联系人姓名")
+    // private String contacts;
     @ApiModelProperty(value = "企业联系人联系方式")
     private String contactsWay;
 

saas-backen/src/main/java/com/pavis/app/saasbacken/service/CategoryService.java

@@ -15,9 +15,10 @@ public interface CategoryService extends IService<Category> {
 
     /**
      * 所属行业转换：电子信息-->I1 OR I1-->电子信息
-     * @param industryName
+     *      录入时 true; 展示时 false。
+     * @param param
      * @param flag true：电子信息-->I1；false：I1-->电子信息
      * @return
      */
-    String dealIndustry(String industryParam,Boolean flag);
+    String dealCategory(String param,Boolean flag);
 }

saas-backen/src/main/java/com/pavis/app/saasbacken/service/OrgRelPersonalService.java

@@ -0,0 +1,27 @@
+package com.pavis.app.saasbacken.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pavis.app.saasbacken.entity.OrgRelPersonal;
+import com.pavis.app.saasbacken.entity.PersonalInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  税务信息
+ * </p>
+ *
+ * @author guan
+ * @since 2021-10-29
+ */
+public interface OrgRelPersonalService extends IService<OrgRelPersonal> {
+
+    /**
+     * 保存企业与人员信息的关联关系。
+     * @param personalInfos
+     * @param orgId
+     * @param relType
+     * @return
+     */
+    List<OrgRelPersonal> saveRels(List<PersonalInfo> personalInfos,String orgId,String resType,String relType);
+}

saas-backen/src/main/java/com/pavis/app/saasbacken/service/PersonalInfoService.java

@@ -15,9 +15,11 @@ public interface PersonalInfoService extends IService<PersonalInfo> {
 
     /**
      * 根据姓名和联系方式，确定人员id。
-     * @param name
-     * @param contactsWay
+     * @param name 姓名
+     * @param contactsWay 联系方式
+     * @param orgId 企业id，可能为null。
+     * @param relType 企业人员类型，如：1 企业负责人 2 法定代表人 3 研发负责人 4 财务负责人 5 科技联络人
      * @return
      */
-    String dealPersonal(String name,String contactsWay,String orgId);
+    String dealPersonal(String name,String contactsWay,String orgId,String resType,String relType);
 }

saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/CategoryServiceImpl.java

@@ -30,19 +30,19 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
     private CategoryMapper categoryMapper;
 
     @Override
-    public String dealIndustry(String industryParam, Boolean flag) {
+    public String dealCategory(String param, Boolean flag) {
         QueryWrapper<Category> categoryQueryWrapper = new QueryWrapper<>();
         List<Category> categories = new ArrayList<>();
         if (true == flag){
-            // true：电子信息-->I1；
-            categoryQueryWrapper.lambda().eq(Category::getName,industryParam);
+            // 录入时：true; 即：电子信息-->I1；
+            categoryQueryWrapper.lambda().eq(Category::getName,param);
             categories = categoryMapper.selectList(categoryQueryWrapper);
-            return categories.size() > 0 ? categories.get(0).getCatCode() : industryParam;
+            return categories.size() > 0 ? categories.get(0).getCatCode() : param;
         }else {
-            // false：I1-->电子信息
-            categoryQueryWrapper.lambda().eq(Category::getCode,industryParam);
+            // 返回至前端展示时：false; 即：I1-->电子信息
+            categoryQueryWrapper.lambda().eq(Category::getCode,param);
             categories = categoryMapper.selectList(categoryQueryWrapper);
-            return categories.size() > 0 ? categories.get(0).getName() : industryParam;
+            return categories.size() > 0 ? categories.get(0).getName() : param;
         }
     }
 }

saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/CheckModuleServiceImpl.java

@@ -320,16 +320,16 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
         categories.add(initCategory("M4", "可以量产", "techMaturity", "606006", "6", "1", "1"));
 
         // 知识产权：发明专利、实用新型、外观设计、软件著作权、PCT
-        categories.add(initCategory("Z1", "发明专利", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z2", "植物新品种", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z3", "国家级农作物品种", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z4", "国家新药", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z5", "国家一级中药保护品种", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z6", "集成电路布图设计专有权", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z7", "实用新型专利", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z8", "外观设计专利", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z9", "软件著作权", "intelType", "605002", "6", "1", "1"));
-        categories.add(initCategory("Z10", "PCT", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S1", "发明专利", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S2", "植物新品种", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S3", "国家级农作物品种", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S4", "国家新药", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S5", "国家一级中药保护品种", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S6", "集成电路布图设计专有权", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S7", "实用新型专利", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S8", "外观设计专利", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S9", "软件著作权", "intelType", "605002", "6", "1", "1"));
+        categories.add(initCategory("S10", "PCT", "intelType", "605002", "6", "1", "1"));
 
         // 知识产权获得方式：有自主研发、   仅有受让、受赠和并购等obtainWay
         categories.add(initCategory("W1", "有自主研发", "obtainWay", "605003", "6", "1", "1"));
@@ -338,15 +338,16 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
         // 发明专利：发明、实用、植物、农作物、新药、中药、集成、外观、软件
 
         // 公司类型：国有、集体、私营、股份制、联营、外商、港澳、股份合作、有限
-        categories.add(initCategory("Q1", "国有", "enterpriseType", "601015", "6", "1", "1"));
-        categories.add(initCategory("Q2", "集体", "enterpriseType", "601015", "6", "1", "1"));
-        categories.add(initCategory("Q3", "私营", "enterpriseType", "601015", "6", "1", "1"));
-        categories.add(initCategory("Q4", "股份制", "enterpriseType", "601015", "6", "1", "1"));
-        categories.add(initCategory("Q5", "联营", "enterpriseType", "601015", "6", "1", "1"));
-        categories.add(initCategory("Q6", "外商", "enterpriseType", "601015", "6", "1", "1"));
-        categories.add(initCategory("Q7", "港澳", "enterpriseType", "601015", "6", "1", "1"));
-        categories.add(initCategory("Q8", "股份合作", "enterpriseType", "601015", "6", "1", "1"));
-        categories.add(initCategory("Q9", "有限", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q1", "国有企业", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q2", "集体所有制企业", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q3", "私营企业", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q4", "股份制企业", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q5", "联营企业", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q6", "外商投资企业", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q7", "港澳台企业", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q8", "股份合作企业", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q9", "有限责任公司（自然人投资或控股）", "enterpriseType", "601015", "6", "1", "1"));
+        categories.add(initCategory("Q10", "其他企业", "enterpriseType", "601015", "6", "1", "1"));
 
 
         // 机构类型：企业、高校、机构、园区、政府、其他 todo  需要修改parentid。
@@ -371,12 +372,26 @@ public class CheckModuleServiceImpl extends ServiceImpl<CheckModuleMapper, Check
         categories.add(initCategory("L6", "F", "talentIdentificationLevel", "608030", "6", "1", "1"));
         categories.add(initCategory("L7", "G", "talentIdentificationLevel", "608030", "6", "1", "1"));
 
-        Dic dic = Dic.builder()
-                .titleCode("esst")
-                .build();
-        List<Dic> dics = new ArrayList<>();
-        dics.add(dic);
-        dicService.saveOrUpdateBatch(dics);
+        // 研发机构等级: 国家级、省级、市级、区级等。
+        categories.add(initCategory("Y1", "国家级", "devOrgLevel", "****", "6", "1", "1"));
+        categories.add(initCategory("Y2", "省级", "devOrgLevel", "****", "6", "1", "1"));
+        categories.add(initCategory("Y3", "市级", "devOrgLevel", "****", "6", "1", "1"));
+        categories.add(initCategory("Y4", "区级", "devOrgLevel", "****", "6", "1", "1"));
+
+        // 企业资质:国高、市高、省科技型中小企业、高企培育、规上、科技型初创企业、高新潜力企业、创新引领企业。
+        categories.add(initCategory("Z1", "国家级", "devOrgLevel", "****", "6", "1", "1"));
+        categories.add(initCategory("Z2", "省级", "devOrgLevel", "****", "6", "1", "1"));
+        categories.add(initCategory("Z3", "市级", "devOrgLevel", "****", "6", "1", "1"));
+        categories.add(initCategory("Z4", "区级", "devOrgLevel", "****", "6", "1", "1"));
+
+
+        // 入库测试。
+        // Dic dic = Dic.builder()
+        //         .titleCode("esst")
+        //         .build();
+        // List<Dic> dics = new ArrayList<>();
+        // dics.add(dic);
+        // dicService.saveOrUpdateBatch(dics);
 
         boolean b = categoryService.saveOrUpdateBatch(categories);
         log.info("b:{}", b);

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

@@ -1,13 +1,17 @@
 package com.pavis.app.saasbacken.service.impl.base;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.form.BasicInfo;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -25,6 +29,7 @@ import java.util.List;
  * @author guan
  * @since 2021-10-29
  */
+@Slf4j
 @Service
 public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicInfoMapper, EnterpriseBasicInfo> implements EnterpriseBasicInfoService {
 
@@ -34,25 +39,46 @@ public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicI
     @Autowired
     private CategoryService categoryService;
 
+    @Autowired
+    private EnterpriseBasicInfoMapper enterpriseBasicInfoMapper;
+
+    @Autowired
+    private EnterpriseOtherInfoService enterpriseOtherInfoService;
+
+    @Autowired
+    private PersonalInfoServiceImpl personalInfoService;
+
     @Override
     public List<EnterpriseBasicInfo> orgBasicAdd(List<Object> basicInfo) throws IOException {
         List<BasicInfo> basicInfos = JSONObject.parseArray(JSONObject.toJSONString(basicInfo), BasicInfo.class);
         // 解析数据。
         List<EnterpriseBasicInfo> addedBasicInfos = new ArrayList<>();
         EnterpriseBasicInfo addBasicInfo;
-        for (EnterpriseBasicInfo info : basicInfos) {
+        // 企业其他数据
+        EnterpriseOtherInfo addOtherInfo;
+        List<EnterpriseOtherInfo> addOtherInfos = new ArrayList<>();
+        for (BasicInfo info : basicInfos) {
+            // 企业基本信息
             addBasicInfo = new EnterpriseBasicInfo();
             BeanUtils.copyProperties(info,addBasicInfo);
-            // 所属行业需要单独处理,做一下转换后进行存储。
-            addBasicInfo.setIndustry(categoryService.dealIndustry(info.getIndustry(),true));
-            // 企业类型
-            addBasicInfo.setEnterpriseType("");
-            //  机构类型
-            addBasicInfo.setResType("6");
-            // 是否规上
-            addBasicInfo.setIsGauge("");
-            // 资质信息
-            addBasicInfo.setQualifyInfo("");
+            
+
+            // 所属行业 需要单独处理,做一下转换后进行存储。
+            addBasicInfo.setIndustry(categoryService.dealCategory(info.getIndustry(),true));
+            // 企业类型：国有企业 集体所有制企业 私营企业 股份制企业 联营企业 外商投资企业 港澳台企业 股份合作企业 有限责任公司 其他企业。
+            addBasicInfo.setEnterpriseType(categoryService.dealCategory(info.getEnterpriseType(),true));
+            // 机构类型：企业 高校 机构 园区 政府 其他。
+            addBasicInfo.setResType(categoryService.dealCategory(info.getResType(),true));
+            // 研发机构等级：国家级、省级、市级、区级等。
+            addBasicInfo.setDevOrgLevel(categoryService.dealCategory(info.getDevOrgLevel(),true));
+            // 是否规上: 前端传0 否 或 1 是。
+            // addBasicInfo.setIsGauge("");
+            // 企业资质：国高、市高、省科技型中小企业、高企培育、规上、科技型初创企业、高新潜力企业、创新引领企业。
+            addBasicInfo.setQualifyInfo(categoryService.dealCategory(info.getQualifyInfo(),true));
+
+
+            // todo 需要保存企业信息，再处理人员信息。
+
             // todo 企业负责人/法人信息关联id，需要将联系人信息新增至人员信息表。同时应该配置至企业与人员信息关联关系表。
             addBasicInfo.setChargeDirectorId("");
             // 企业联系人
@@ -63,10 +89,64 @@ public class EnterpriseBasicInfoServiceImpl extends ServiceImpl<EnterpriseBasicI
             addBasicInfo.setFinancialDirectorId("");
             // 科技联络人信息关联id
             addBasicInfo.setTechnicalDirectorId("");
-
+            // todo 还要考虑到企业库的其他信息的录入，主要包含了高企管理相关录入信息。
             // 行业领域也由节点管理员进行配置。
             addedBasicInfos.add(addBasicInfo);
         }
+        log.info("addedBasicInfos before:{}", JSON.toJSONString(addedBasicInfos));
+        // 批量新增企业基本信息。
+        boolean b = saveBatch(addedBasicInfos);
+        log.info("save basic-org info res:{}",b);
+        log.info("addedBasicInfos after:{}", JSON.toJSONString(addedBasicInfos));
+        // 处理人员信息关联关系。
+        for (int i = 0; i < addedBasicInfos.size(); i++) {
+            // 1 企业联系人姓名及联系方式。
+            String s1 = personalInfoService.dealPersonal(basicInfos.get(i).getContacts(), basicInfos.get(i).getContacts(),
+                    addedBasicInfos.get(i).getId(), "6", "1");
+            addedBasicInfos.get(i).setContactsId(s1);
+
+            // 2 企业负责人/法定代表人姓名及联系方式。
+            String s2 = personalInfoService.dealPersonal(basicInfos.get(i).getChargeDirectorName(), basicInfos.get(i).getContacts(),
+                    addedBasicInfos.get(i).getId(), "6", "2");
+            addedBasicInfos.get(i).setChargeDirectorId(s1);
+
+            // 3 研发负责人姓名及联系方式。
+            String s3 = personalInfoService.dealPersonal(basicInfos.get(i).getResearchDevName(), basicInfos.get(i).getContacts(),
+                    addedBasicInfos.get(i).getId(), "6", "3");
+            addedBasicInfos.get(i).setResearchDevDirectorId(s1);
+
+            // 4 财务负责人姓名及联系方式。
+            String s4 = personalInfoService.dealPersonal(basicInfos.get(i).getFinancialName(), basicInfos.get(i).getContacts(),
+                    addedBasicInfos.get(i).getId(), "6", "4");
+            addedBasicInfos.get(i).setFinancialDirectorId(s1);
+
+            // 5 科技联络人姓名及联系方式。
+            String s5 = personalInfoService.dealPersonal(basicInfos.get(i).getTechnicalName(), basicInfos.get(i).getContacts(),
+                    addedBasicInfos.get(i).getId(), "6", "5");
+            addedBasicInfos.get(i).setTechnicalDirectorId(s1);
+
+            log.info("update addedBasicInfos:{}",JSON.toJSONString(addedBasicInfos));
+
+
+            // 企业其他信息：
+            // 企业其他信息
+            addOtherInfo = new EnterpriseOtherInfo();
+            BeanUtils.copyProperties(addedBasicInfos.get(i),addOtherInfo);
+            // todo 待处理字段如：国高八大领域。
+            addOtherInfos.add(addOtherInfo);
+        }
+
+        log.info("update addedBasicInfos:{}",JSON.toJSONString(addedBasicInfos));
+        // 更新企业人员信息：
+        boolean b1 = saveOrUpdateBatch(addedBasicInfos);
+        log.info("update basic-info res:{}",b1);
+
+        log.info("other-info:{}",JSON.toJSONString(addOtherInfos));
+
+        // 批量新增企业其他信息。
+        boolean b2 = enterpriseOtherInfoService.saveOrUpdateBatch(addOtherInfos);
+        log.info("save other-info res:{}",b2);
+
         return esService.selEsByName(addedBasicInfos.get(0).getName());
     }
 }

saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/OrgRelPersonalServiceImpl.java

@@ -0,0 +1,72 @@
+package com.pavis.app.saasbacken.service.impl.base;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pavis.app.saasbacken.dao.OrgRelPersonalMapper;
+import com.pavis.app.saasbacken.entity.OrgRelPersonal;
+import com.pavis.app.saasbacken.entity.PersonalInfo;
+import com.pavis.app.saasbacken.service.OrgRelPersonalService;
+import lombok.extern.slf4j.Slf4j;
+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 OrgRelPersonalServiceImpl extends ServiceImpl<OrgRelPersonalMapper, OrgRelPersonal> implements OrgRelPersonalService {
+
+    @Autowired
+    private OrgRelPersonalMapper orgRelPersonalMapper;
+
+    @Override
+    public List<OrgRelPersonal> saveRels(List<PersonalInfo> personalInfos, String orgId,String resType, String relType) {
+        // 人员信息存在，判断关联关系是否存在。
+        List<OrgRelPersonal> orgRelPersonals = orgRelPersonalMapper.selectList(new QueryWrapper<OrgRelPersonal>().lambda()
+                .eq(OrgRelPersonal::getPersonalId,personalInfos.get(0).getId())
+                .eq(OrgRelPersonal::getEnterpriseId,orgId));
+        if (orgRelPersonals.size() > 0){
+            // 关联关系存在，直接返回id。
+            return orgRelPersonals;
+        }else {
+            // 关联关系不存在，新增关联关系后，返回主键id。
+            OrgRelPersonal orgRelPersonal = initRel(resType,relType,orgId,personalInfos);
+            int insert = orgRelPersonalMapper.insert(orgRelPersonal);
+            log.info("save org-personal-rel res:{}",insert);
+            List<OrgRelPersonal> relLists = new ArrayList<>();
+            relLists.add(orgRelPersonal);
+            return relLists;
+        }
+    }
+
+    /**
+     * 初始化资源库与人员关联关系。
+     * @param resType
+     * @param relType
+     * @param orgId
+     * @param personalInfos
+     * @return
+     */
+    public OrgRelPersonal initRel(String resType,String relType,String orgId,List<PersonalInfo> personalInfos){
+        OrgRelPersonal orgRelPersonal = OrgRelPersonal.builder()
+                .resType(resType)
+                .relType(relType)
+                .enterpriseId(orgId)
+                .personalId(personalInfos.get(0).getId())
+                .name(personalInfos.get(0).getName())
+                .contacts(personalInfos.get(0).getContact())
+                .build();
+        return orgRelPersonal;
+    }
+}

saas-backen/src/main/java/com/pavis/app/saasbacken/service/impl/base/PersonalInfoServiceImpl.java

@@ -1,10 +1,12 @@
 package com.pavis.app.saasbacken.service.impl.base;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.pavis.app.saasbacken.entity.PersonalInfo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pavis.app.saasbacken.dao.PersonalInfoMapper;
+import com.pavis.app.saasbacken.entity.OrgRelPersonal;
+import com.pavis.app.saasbacken.entity.PersonalInfo;
+import com.pavis.app.saasbacken.service.OrgRelPersonalService;
 import com.pavis.app.saasbacken.service.PersonalInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,32 +29,40 @@ public class PersonalInfoServiceImpl extends ServiceImpl<PersonalInfoMapper, Per
     @Autowired
     private PersonalInfoMapper personalInfoMapper;
 
+    @Autowired
+    private OrgRelPersonalService orgRelPersonalService;
+
     @Override
-    public String dealPersonal(String name, String contactsWay,String orgId) {
+    public String dealPersonal(String name, String contactsWay,String orgId,String resType,String relType) {
         List<PersonalInfo> personalInfos = new ArrayList<>();
-        if (null != orgId){
-            // 企业基本信息不存在。
-            personalInfos = personalInfoMapper.selectList(new QueryWrapper<PersonalInfo>()
-                    .lambda().eq(PersonalInfo::getName,name).eq(PersonalInfo::getContact,contactsWay));
-        }else {
-            // 企业基本信息存在。
-            personalInfos = personalInfoMapper.selectList(new QueryWrapper<PersonalInfo>()
-                    .lambda().eq(PersonalInfo::getName,name).eq(PersonalInfo::getContact,contactsWay).eq(PersonalInfo::getEnterpriseId,orgId));
-        }
+        // todo relType：财务、科技、法定代表人？
+        // 企业基本信息不存在。需要创建关联关系。
+        personalInfos = personalInfoMapper.selectList(new QueryWrapper<PersonalInfo>()
+                .lambda().eq(PersonalInfo::getName,name)
+                .eq(PersonalInfo::getContact,contactsWay));
+        // 判断人员信息是否存在。
         if (personalInfos.size() > 0){
-            // 已存在人员信息，直接返回id
-            return personalInfos.get(0).getId();
+            List<OrgRelPersonal> orgRelPersonals = orgRelPersonalService.saveRels(personalInfos, orgId, resType, relType);
+            return orgRelPersonals.size() > 0 ? orgRelPersonals.get(0).getId() : "0";
         }else {
-            // 人员信息不存在，新增人员信息后，返回id。
+            // 人员信息不存在，新建人员信息。
             PersonalInfo personalInfo = initPersonalInfo(name, contactsWay);
             int insert = personalInfoMapper.insert(personalInfo);
-            log.info("insert res:{},personalId:{}",insert,personalInfo.getId());
-            // 新建企业信息与人员信息的关联关系。
-
-            return personalInfo.getId();
+            log.info("save personal-info res:{}",insert);
+            List<PersonalInfo> infoLists = new ArrayList<>();
+            infoLists.add(personalInfo);
+            // 创建关联关系。
+            List<OrgRelPersonal> orgRelPersonals = orgRelPersonalService.saveRels(infoLists, orgId, resType, relType);
+            return orgRelPersonals.size() > 0 ? orgRelPersonals.get(0).getId() : "0";
         }
     }
 
+    /**
+     * 初始化人员信息。
+     * @param name
+     * @param contactsWay
+     * @return
+     */
     public PersonalInfo initPersonalInfo(String name,String contactsWay){
         PersonalInfo personalInfo = PersonalInfo.builder()
                 .name(name)