().eq("id",id));
+
+ return ResponseResult.SUCCESS(crmsCompanyPersonal);
+ }
+}
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java
new file mode 100644
index 00000000..4da79e82
--- /dev/null
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCustomerRelatedController.java
@@ -0,0 +1,46 @@
+package com.daqing.financial.crms.controller;
+
+
+import com.daqing.financial.crms.service.ICrmsCustomerRelatedService;
+import com.daqing.framework.domain.crms.CrmsCompanyPersonal;
+import com.daqing.framework.domain.crms.CrmsCustomerRelated;
+import com.daqing.framework.model.response.ResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ *
+ * 客户关联表 前端控制器
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-12
+ */
+@Api(tags = {"关联关系"})
+@RestController
+@RequestMapping("/crms-customer-related")
+public class CrmsCustomerRelatedController {
+
+ @Resource
+ private ICrmsCustomerRelatedService crmsCustomerRelatedService;
+
+ /**
+ * 新增关联关系
+ */
+ @PostMapping("/insertCustomerRelated")
+ @ApiOperation(value = "新增关联关系")
+ public ResponseResult insertCustomerRelated(@RequestBody @Valid CrmsCustomerRelated crmsCustomerRelated) {
+ boolean result = crmsCustomerRelatedService.save(crmsCustomerRelated);
+
+ return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL();
+ }
+}
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCompanyPersonalMapper.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCompanyPersonalMapper.java
new file mode 100644
index 00000000..8bd2b943
--- /dev/null
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCompanyPersonalMapper.java
@@ -0,0 +1,23 @@
+package com.daqing.financial.crms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.daqing.framework.domain.crms.CrmsCompanyPersonal;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ *
+ * 关联人/关联企业 Mapper 接口
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-13
+ */
+@Mapper
+public interface CrmsCompanyPersonalMapper extends BaseMapper {
+ IPage pageByCondition(Page page);
+
+ boolean updateIsExistRelated(@Param("id") Integer id, @Param("isExistRelated") Integer isExistRelated);
+}
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCustomerRelatedMapper.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCustomerRelatedMapper.java
new file mode 100644
index 00000000..e3690807
--- /dev/null
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCustomerRelatedMapper.java
@@ -0,0 +1,22 @@
+package com.daqing.financial.crms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.crms.CrmsCustomerRelated;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 客户关联表 Mapper 接口
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-12
+ */
+@Mapper
+public interface CrmsCustomerRelatedMapper extends BaseMapper {
+
+ boolean deleteByIds(@Param("ids") List ids);
+}
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCompanyPersonalService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCompanyPersonalService.java
new file mode 100644
index 00000000..a95768b3
--- /dev/null
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCompanyPersonalService.java
@@ -0,0 +1,20 @@
+package com.daqing.financial.crms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.crms.CrmsCompanyPersonal;
+import com.daqing.framework.utils.PageUtils;
+
+/**
+ *
+ * 关联人/关联企业 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-13
+ */
+public interface ICrmsCompanyPersonalService extends IService {
+
+ PageUtils queryPage(Integer page, Integer size);
+
+ boolean updateIsExistRelated(Integer id, Integer isExistRelated);
+}
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCustomerRelatedService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCustomerRelatedService.java
new file mode 100644
index 00000000..a1696555
--- /dev/null
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCustomerRelatedService.java
@@ -0,0 +1,19 @@
+package com.daqing.financial.crms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.crms.CrmsCustomerRelated;
+
+import java.util.List;
+
+/**
+ *
+ * 客户关联表 服务类
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-12
+ */
+public interface ICrmsCustomerRelatedService extends IService {
+
+ boolean deleteByRelateIds(List asList);
+}
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCompanyPersonalServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCompanyPersonalServiceImpl.java
new file mode 100644
index 00000000..bc7ee781
--- /dev/null
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCompanyPersonalServiceImpl.java
@@ -0,0 +1,40 @@
+package com.daqing.financial.crms.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.daqing.financial.crms.mapper.CrmsCompanyPersonalMapper;
+import com.daqing.financial.crms.service.ICrmsCompanyPersonalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.framework.domain.crms.CrmsCompanyPersonal;
+import com.daqing.framework.utils.PageUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 关联人/关联企业 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-13
+ */
+@Service
+public class CrmsCompanyPersonalServiceImpl extends ServiceImpl implements ICrmsCompanyPersonalService {
+ @Override
+ public PageUtils queryPage(Integer page, Integer size) {
+ //分页参数
+ if (page <= 0) {
+ page = 1;
+ }
+ if (size <= 0) {
+ size = 10;
+ }
+ IPage positionVO = this.getBaseMapper().pageByCondition(new Page(page, size));
+
+ return new PageUtils(positionVO);
+ }
+
+ @Override
+ public boolean updateIsExistRelated(Integer id, Integer isExistRelated) {
+ return this.getBaseMapper().updateIsExistRelated(id,isExistRelated);
+ }
+}
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCustomerRelatedServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCustomerRelatedServiceImpl.java
new file mode 100644
index 00000000..1bf9796b
--- /dev/null
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCustomerRelatedServiceImpl.java
@@ -0,0 +1,26 @@
+package com.daqing.financial.crms.service.impl;
+
+import com.daqing.financial.crms.mapper.CrmsCustomerRelatedMapper;
+import com.daqing.financial.crms.service.ICrmsCustomerRelatedService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.framework.domain.crms.CrmsCustomerRelated;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * 客户关联表 服务实现类
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-12
+ */
+@Service
+public class CrmsCustomerRelatedServiceImpl extends ServiceImpl implements ICrmsCustomerRelatedService {
+
+ @Override
+ public boolean deleteByRelateIds(List ids) {
+ return this.getBaseMapper().deleteByIds(ids);
+ }
+}
diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
index 2d05cc87..b0bbc85d 100644
--- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
@@ -15,6 +15,7 @@
+
diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml b/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml
new file mode 100644
index 00000000..e50107d1
--- /dev/null
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ update crms_company_customer set is_exist_related=#{isExistRelated} where id=#{id}
+
+
+
+
+
diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CrmsCustomerRelatedMapper.xml b/dq-financial-crms/src/main/resources/mapper/crms/CrmsCustomerRelatedMapper.xml
new file mode 100644
index 00000000..2b0cda30
--- /dev/null
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CrmsCustomerRelatedMapper.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ delete from crms_customer_related where related_id in
+
+ #{id}
+
+
+
+
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBankController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBankController.java
index e8cb9a8a..c3ab02c2 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBankController.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBankController.java
@@ -4,6 +4,7 @@ package com.daqing.financial.guarantee.controller;
import com.daqing.financial.guarantee.service.IDgBankService;
import com.daqing.framework.domain.guarantee.DgBank;
import com.daqing.framework.model.response.ResponseResult;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -20,6 +21,7 @@ import java.util.List;
* @author Qyq
* @since 2020-11-12
*/
+@Api(tags = {"银行管理"})
@RestController
@RequestMapping("/dg-bank")
public class DgBankController {
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java
index e8d4f79a..70129446 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java
@@ -1,10 +1,13 @@
package com.daqing.financial.guarantee.feign;
+import com.daqing.framework.domain.crms.CrmsCompanyPersonal;
+import com.daqing.framework.domain.crms.CrmsCustomerRelated;
import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
import com.daqing.framework.model.response.ResponseResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
/**
@@ -19,4 +22,15 @@ public interface CrmsFeignService {
@PostMapping("/crms/customer/queryCustomerInfoById")
ResponseResult queryCustomerInfoById(@RequestBody DgApplyAmountInfoRequest applyAmountInfo);
+ /**
+ * 新增个人/企业关联人
+ */
+ @PostMapping("/crms-customer-related/insertCustomerRelated")
+ ResponseResult insertCustomerRelated(@RequestBody CrmsCustomerRelated crmsCustomerRelated);
+
+ /**
+ * 编辑是否存在关联人
+ */
+ @PostMapping("/crms-company-personal/updateIsExistRelated")
+ ResponseResult updateIsExistRelated(@RequestParam("id")Integer id, @RequestParam("isExistRelated")Integer isExistRelated);
}
\ No newline at end of file
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java
index 1b031eca..34934264 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java
@@ -61,7 +61,7 @@ public class BusinessApplicationRequest implements Serializable {
* 反担保措施（中划线隔开）
*/
@ApiModelProperty(value = "反担保措施（中划线隔开）")
- private String enGuaranteeMeasures;
+ private String[] enGuaranteeMeasures;
/**
* 反担保措施描述
@@ -92,73 +92,73 @@ public class BusinessApplicationRequest implements Serializable {
* 营业执照复印件
*/
@ApiModelProperty(value = "营业执照复印件")
- private String businessLicense;
+ private String[] businessLicense;
/**
* 上传法定代表人夫妻及企业实际经营者身份证复印件
*/
@ApiModelProperty(value = "上传法定代表人夫妻及企业实际经营者身份证复印件")
- private String legalCardCopy;
+ private String[] legalCardCopy;
/**
* 法定代表人夫妻户口本，结婚证（离婚证）复印件
*/
@ApiModelProperty(value = "法定代表人夫妻户口本，结婚证（离婚证）复印件")
- private String marriageCopy;
+ private String[] marriageCopy;
/**
* 法定代表人身份证明
*/
@ApiModelProperty(value = "法定代表人身份证明")
- private String legalCopy;
+ private String[] legalCopy;
/**
* 公司章程
*/
@ApiModelProperty(value = "公司章程")
- private String companyConstitution;
+ private String[] companyConstitution;
/**
* 会计师事务所审计的上一年度及本年度审计报告
*/
@ApiModelProperty(value = "会计师事务所审计的上一年度及本年度审计报告")
- private String accountingFirm;
+ private String[] accountingFirm;
/**
* 企业信用报告
*/
@ApiModelProperty(value = "企业信用报告")
- private String companyCredit;
+ private String[] companyCredit;
/**
* 企业法人夫妇信用报告，实际经营者信用报告
*/
@ApiModelProperty(value = "企业法人夫妇信用报告，实际经营者信用报告")
- private String creditReport;
+ private String[] creditReport;
/**
* 征信业务授权书，承诺书
*/
@ApiModelProperty(value = "征信业务授权书，承诺书")
- private String certificateAuthorization;
+ private String[] certificateAuthorization;
/**
* 增值税纳税申报表首表复印件/完税证明
*/
@ApiModelProperty(value = "增值税纳税申报表首表复印件/完税证明")
- private String taxCertificate;
+ private String[] taxCertificate;
/**
* 股东会会议纪要
*/
@ApiModelProperty(value = "股东会会议纪要")
- private String meetingMinutes;
+ private String[] meetingMinutes;
/**
* 反担保资料和评估报告
*/
@ApiModelProperty(value = "反担保资料和评估报告")
- private String assessmentReport;
+ private String[] assessmentReport;
/**
* 区分保存和提交按钮 true->commit
@@ -166,4 +166,16 @@ public class BusinessApplicationRequest implements Serializable {
@ApiModelProperty(value = "区分保存和提交按钮")
private boolean isSaveOrCommit;
+ /**
+ * 关联人id
+ */
+ @ApiModelProperty(value = "关联人id")
+ private Integer relatedId;
+
+ /**
+ * 是否存在关联人
+ */
+ @ApiModelProperty(value = "是否存在关联人")
+ private Integer isExistRelated;
+
}
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
index 8c99c2a1..ca685dbb 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java
@@ -12,6 +12,7 @@ import com.daqing.financial.guarantee.model.response.BusinessApplicationDetailRe
import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.daqing.framework.domain.crms.CrmsCustomerRelated;
import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
import com.daqing.framework.domain.crms.response.CompanyCustomerResponse;
import com.daqing.framework.domain.crms.response.CrmsCode;
@@ -28,6 +29,7 @@ import com.daqing.framework.utils.excel.ExcelUtil;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -83,15 +85,16 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl().eq("business_id",businessApplication.getId()));
@@ -231,7 +247,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl employeeMessage = hrmsFeignService.getAccountAndDeptNameById(Long.valueOf(userId));
+ ResponseResult employeeMessage = hrmsFeignService.getAccountAndDeptNameById(5l);
try {
List list = this.getBaseMapper().excelList();
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java
index a56b57f8..6e25b3b5 100644
--- a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java
@@ -84,4 +84,10 @@ public class CompanyCustomerEntity implements Serializable {
@ApiModelProperty(value = "客户基本信息表id")
private Long customerId;
+ /**
+ * 是否存在关联人
+ */
+ @ApiModelProperty(value = "是否存在关联人")
+ private Integer isExistRelated;
+
}
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java
new file mode 100644
index 00000000..c9707fd1
--- /dev/null
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCompanyPersonal.java
@@ -0,0 +1,140 @@
+package com.daqing.framework.domain.crms;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 关联人/关联企业
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-13
+ */
+@Data
+@TableName("crms_company_personal")
+public class CrmsCompanyPersonal implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 关联人名称
+ */
+ @ApiModelProperty(value = "关联人名称")
+ private String relatedName;
+
+ /**
+ * 联系地址
+ */
+ @ApiModelProperty(value = "联系地址")
+ private String address;
+
+ /**
+ * 社会统一代码
+ */
+ @ApiModelProperty(value = "社会统一代码")
+ private String socialUnifiedCode;
+
+ /**
+ * 注册资金（元）
+ */
+ @ApiModelProperty(value = "注册资金（元）")
+ private String registeredCapital;
+
+ /**
+ * 注册时间
+ */
+ @ApiModelProperty(value = "注册时间")
+ private Date registeredTime;
+
+ /**
+ * 所属行业
+ */
+ @ApiModelProperty(value = "所属行业")
+ private String industry;
+
+ /**
+ * 法人姓名
+ */
+ @ApiModelProperty(value = "法人姓名")
+ private String legalPersonName;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ /**
+ * 关联关系
+ */
+ @ApiModelProperty(value = "关联关系")
+ private String relationship;
+
+ /**
+ * 股东情况
+ */
+ @ApiModelProperty(value = "股东情况")
+ private String shareholdersSituation;
+
+ /**
+ * 婚姻状况,0:未婚,1:已婚,2:离异,3:再婚
+ */
+ @ApiModelProperty(value = "婚姻状况,0:未婚,1:已婚,2:离异,3:再婚")
+ private Integer maritalStatus;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ /**
+ * 性别：1、男，0、女
+ */
+ @ApiModelProperty(value = "性别：1、男，0、女")
+ private Integer gender;
+
+ /**
+ * 学历,0:本科,1:大专,2:高职,3:中专,4:其他
+ */
+ @ApiModelProperty(value = "学历,0:本科,1:大专,2:高职,3:中专,4:其他")
+ private Integer education;
+
+ /**
+ * 工作单位
+ */
+ @ApiModelProperty(value = "工作单位")
+ private String employer;
+
+ /**
+ * 职务
+ */
+ @ApiModelProperty(value = "职务")
+ private String position;
+
+ /**
+ * 关联人类型
+ */
+ @ApiModelProperty(value = "关联人类型")
+ private String type;
+}
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCustomerRelated.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCustomerRelated.java
new file mode 100644
index 00000000..d1d6bc02
--- /dev/null
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CrmsCustomerRelated.java
@@ -0,0 +1,49 @@
+package com.daqing.framework.domain.crms;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 客户关联表
+ *
+ *
+ * @author Qyq
+ * @since 2020-11-12
+ */
+@Data
+@TableName("crms_customer_related")
+public class CrmsCustomerRelated implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 企业id
+ */
+ @ApiModelProperty(value = "企业id")
+ private Integer customerId;
+
+ /**
+ * 关联人id
+ */
+ @ApiModelProperty(value = "关联人id")
+ private Integer relatedId;
+
+ /**
+ * 关联客户类型：1->企业类型；0->个人类型
+ */
+ @ApiModelProperty(value = "关联客户类型：1->企业类型；0->个人类型")
+ private Integer relatedType;
+}
diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CompanyPersonalRequest.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CompanyPersonalRequest.java
new file mode 100644
index 00000000..6abe2738
--- /dev/null
+++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CompanyPersonalRequest.java
@@ -0,0 +1,146 @@
+package com.daqing.framework.domain.crms.request;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 记录客户基本信息
+ *
+ * @author gongsj
+ * @email gongsj@gmail.com
+ * @date 2020-09-08 11:23:28
+ */
+@Data
+@ToString
+public class CompanyPersonalRequest implements Serializable {
+
+ /**
+ * 主键
+ */
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 关联人名称
+ */
+ @ApiModelProperty(value = "关联人名称")
+ private String relatedName;
+
+ /**
+ * 联系地址
+ */
+ @ApiModelProperty(value = "联系地址")
+ private String address;
+
+ /**
+ * 社会统一代码
+ */
+ @ApiModelProperty(value = "社会统一代码")
+ private String socialUnifiedCode;
+
+ /**
+ * 注册资金（元）
+ */
+ @ApiModelProperty(value = "注册资金（元）")
+ private String registeredCapital;
+
+ /**
+ * 注册时间
+ */
+ @ApiModelProperty(value = "注册时间")
+ private Date registeredTime;
+
+ /**
+ * 所属行业
+ */
+ @ApiModelProperty(value = "所属行业")
+ private String industry;
+
+ /**
+ * 法人姓名
+ */
+ @ApiModelProperty(value = "法人姓名")
+ private String legalPersonName;
+
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+ /**
+ * 关联关系
+ */
+ @ApiModelProperty(value = "关联关系")
+ private String relationship;
+
+ /**
+ * 股东情况
+ */
+ @ApiModelProperty(value = "股东情况")
+ private String shareholdersSituation;
+
+ /**
+ * 婚姻状况,0:未婚,1:已婚,2:离异,3:再婚
+ */
+ @ApiModelProperty(value = "婚姻状况,0:未婚,1:已婚,2:离异,3:再婚")
+ private Integer maritalStatus;
+
+ /**
+ * 身份证号
+ */
+ @ApiModelProperty(value = "身份证号")
+ private String idCard;
+
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ /**
+ * 性别：1、男，0、女
+ */
+ @ApiModelProperty(value = "性别：1、男，0、女")
+ private Integer gender;
+
+ /**
+ * 学历,0:本科,1:大专,2:高职,3:中专,4:其他
+ */
+ @ApiModelProperty(value = "学历,0:本科,1:大专,2:高职,3:中专,4:其他")
+ private Integer education;
+
+ /**
+ * 工作单位
+ */
+ @ApiModelProperty(value = "工作单位")
+ private String employer;
+
+ /**
+ * 职务
+ */
+ @ApiModelProperty(value = "职务")
+ private String position;
+
+ /**
+ * 关联人类型
+ */
+ @ApiModelProperty(value = "关联人类型")
+ private String type;
+
+ /**
+ * 企业id
+ */
+ @ApiModelProperty(value = "企业id")
+ private Integer companyId;
+
+}
diff --git a/dq-govern-gateway/src/main/resources/jwt.properties b/dq-govern-gateway/src/main/resources/jwt.properties
index c4f46e52..4b24fd18 100644
--- a/dq-govern-gateway/src/main/resources/jwt.properties
+++ b/dq-govern-gateway/src/main/resources/jwt.properties
@@ -11,6 +11,7 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
/api-hrms/hrms/employee/excelTemplate,\
/apiHrmsAuth/hrms/auth/userlogin/bindPhoneAndOpenId,\
/apiHrmsAuth/hrms/auth/userlogin/sendCode,\
- /apiHrmsAuth/hrms/auth/userlogin/isPhoneExist
+ /apiHrmsAuth/hrms/auth/userlogin/isPhoneExist,\
+ /api-guarantee/dg-apply-amount-info/excelExport