Merge remote-tracking branch 'origin/master'

dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CrmsCompanyPersonalController.java

@@ -39,8 +39,9 @@ public class CrmsCompanyPersonalController {
      */
     @GetMapping("/companyPersonalList")
     @ApiOperation(value = "个人/企业关联人列表")
-    public ResponseResult companyPersonalList(@RequestParam("page") Integer page, @RequestParam("size") Integer size) {
-        PageUtils data = crmsCompanyPersonalService.queryPage(page, size);
+    public ResponseResult companyPersonalList(@RequestParam("page") Integer page, @RequestParam("size") Integer size
+            , @RequestParam(value="customerId",required = false) Integer customerId) {
+        PageUtils data = crmsCompanyPersonalService.queryPage(page, size, customerId);
         return new ResponseResult<PageUtils>().SUCCESS(data);
     }
 
@@ -70,9 +71,9 @@ public class CrmsCompanyPersonalController {
     /**
      * 删除个人/企业关联人
      */
-    @GetMapping("/deleteCompanyPersonal")
+    @PostMapping("/deleteCompanyPersonal")
     @ApiOperation(value = "删除个人/企业关联人")
-    public ResponseResult deleteCompanyPersonal(@RequestParam("ids") Long[] ids) {
+    public ResponseResult deleteCompanyPersonal(@RequestBody Long[] ids) {
         boolean result = crmsCompanyPersonalService.removeByIds(Arrays.asList(ids));
         //同时删除关联关系
         boolean relate = crmsCustomerRelatedService.deleteByRelateIds(Arrays.asList(ids));

dq-financial-crms/src/main/java/com/daqing/financial/crms/mapper/CrmsCompanyPersonalMapper.java

@@ -17,7 +17,8 @@ import org.apache.ibatis.annotations.Param;
  */
 @Mapper
 public interface CrmsCompanyPersonalMapper extends BaseMapper<CrmsCompanyPersonal> {
-    IPage<CrmsCompanyPersonal> pageByCondition(Page page);
 
     boolean updateIsExistRelated(@Param("id") Integer id, @Param("isExistRelated") Integer isExistRelated);
+
+    IPage<CrmsCompanyPersonal> pageByCondition(Page page, Integer customerId);
 }

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/ICrmsCompanyPersonalService.java

@@ -14,7 +14,7 @@ import com.daqing.framework.utils.PageUtils;
  */
 public interface ICrmsCompanyPersonalService extends IService<CrmsCompanyPersonal> {
 
-    PageUtils queryPage(Integer page, Integer size);
+    PageUtils queryPage(Integer page, Integer size, Integer customerId);
 
     boolean updateIsExistRelated(Integer id, Integer isExistRelated);
 }

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CrmsCompanyPersonalServiceImpl.java

@@ -20,7 +20,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class CrmsCompanyPersonalServiceImpl extends ServiceImpl<CrmsCompanyPersonalMapper, CrmsCompanyPersonal> implements ICrmsCompanyPersonalService {
     @Override
-    public PageUtils queryPage(Integer page, Integer size) {
+    public PageUtils queryPage(Integer page, Integer size, Integer customerId) {
         //分页参数
         if (page <= 0) {
             page = 1;
@@ -28,7 +28,7 @@ public class CrmsCompanyPersonalServiceImpl extends ServiceImpl<CrmsCompanyPerso
         if (size <= 0) {
             size = 10;
         }
-        IPage<CrmsCompanyPersonal> positionVO = this.getBaseMapper().pageByCondition(new Page(page, size));
+        IPage<CrmsCompanyPersonal> positionVO = this.getBaseMapper().pageByCondition(new Page(page, size),customerId);
 
         return new PageUtils(positionVO);
     }

dq-financial-crms/src/main/resources/bootstrap.properties

@@ -2,7 +2,7 @@
 #服务名称
 spring.application.name=dq-financial-crms
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.142:8848
+spring.cloud.nacos.config.server-addr=192.168.31.140:8848
 spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354
 #spring.cloud.nacos.config.group=prod
 

dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml

@@ -48,6 +48,7 @@
         FROM crms_company_customer cu
         left join crms_customer cc on cu.customer_id = cc.id
         <where>
+        cc.del_or_not=0 and cc.status=0
             <if test="applyAmountInfo.code != null and applyAmountInfo.code != '' ">
                 AND cc.code LIKE CONCAT('%',#{applyAmountInfo.code},'%')
             </if>

dq-financial-crms/src/main/resources/mapper/crms/CrmsCompanyPersonalMapper.xml

@@ -33,5 +33,8 @@
         select cp.id,cp.relationship,cp.`type`,cp.related_name,cp.phone,cp.address
         from crms_company_personal cp
         left join crms_customer_related cr on cr.related_id=cp.id
+        <where>
+            cr.customer_id=#{customerId}
+        </where>
     </select>
 </mapper>

dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml

@@ -92,7 +92,7 @@
 
     <!-- 获取所有客户编号和客户名称 -->
     <select id="queryCompanyCodeAndName" parameterType="int" resultMap="customerMap">
-        SELECT code,`name` from crms_customer where `type` =#{type}
+        SELECT code,`name` from crms_customer where `type` =#{type} and del_or_not = 0 and status = 0
     </select>
 
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java

@@ -165,7 +165,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
             e.printStackTrace();
         }
         //根据userId获取用户名以及部门名称
-        ResponseResult<EmployeeMessageResponse> employeeMessage = hrmsFeignService.getAccountAndDeptNameById(Long.valueOf(userId));
+        ResponseResult<EmployeeMessageResponse> employeeMessage = hrmsFeignService.getAccountAndDeptNameById(5L);
 
         PageUtils data = applyAmountInfoService.queryPage(page, size,CustomerNumberOrName);
         //遍历data里面的数据提单人id,找出匹配id,将用户名以及部门名称赋值进去
@@ -209,7 +209,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
      * @param id
      * @return
      */
-    @PostMapping("/revokeBusinessApplication")
+    @GetMapping("/revokeBusinessApplication")
     @ApiOperation(value = "根据业务id撤销业务申请内容")
     public ResponseResult revokeBusinessApplication(@RequestParam("id") Integer id){
         int result = applyAmountInfoService.revokeBusinessApplication(id);

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeInvestigationController.java

@@ -1,20 +0,0 @@
-package com.daqing.financial.guarantee.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 担保调查 前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@RestController
-@RequestMapping("/dg-guarantee-investigation")
-public class DgGuaranteeInvestigationController {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/CrmsFeignService.java

@@ -5,6 +5,7 @@ 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.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -33,4 +34,11 @@ public interface CrmsFeignService {
      */
     @PostMapping("/crms-company-personal/updateIsExistRelated")
     ResponseResult updateIsExistRelated(@RequestParam("id")Integer id, @RequestParam("isExistRelated")Integer isExistRelated);
+
+    /**
+     * 个人/企业关联人列表
+     */
+    @GetMapping("/crms-company-personal/companyPersonalList")
+    ResponseResult companyPersonalList(@RequestParam("page") Integer page, @RequestParam("size") Integer size, @RequestParam("customerId") Integer customerId);
+
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgApplyAmountInfoMapper.java

@@ -4,6 +4,7 @@ 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.financial.guarantee.model.response.BusinessApplicationListResponse;
+import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse;
 import com.daqing.framework.domain.guarantee.DgApplyAmountInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +26,5 @@ public interface DgApplyAmountInfoMapper extends BaseMapper<DgApplyAmountInfo> {
 
     List<BusinessApplicationListResponse> excelList();
 
+    DgApplyAmountInfoResponse selectApplyAmountInfoById(Integer id);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgEnclosureInfoMapper.java

@@ -1,6 +1,7 @@
 package com.daqing.financial.guarantee.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse;
 import com.daqing.framework.domain.guarantee.DgEnclosureInfo;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DgEnclosureInfoMapper extends BaseMapper<DgEnclosureInfo> {
 
-    DgEnclosureInfo selectByCompanyId(Integer id);
+    DgEnclosureInfoResponse selectByCompanyId(Integer id);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeInvestigationMapper.java

@@ -1,18 +0,0 @@
-package com.daqing.financial.guarantee.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.daqing.framework.domain.guarantee.DgGuaranteeInvestigation;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 担保调查 Mapper 接口
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@Mapper
-public interface DgGuaranteeInvestigationMapper extends BaseMapper<DgGuaranteeInvestigation> {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/BusinessApplicationRequest.java

@@ -57,6 +57,12 @@ public class BusinessApplicationRequest implements Serializable {
     @ApiModelProperty(value = "贷款用途")
     private String amountWide;
 
+    /**
+     * 其他贷款用途
+     */
+    @ApiModelProperty(value = "其他贷款用途")
+    private String otherAmountWide;
+
     /**
      * 反担保措施（中划线隔开）
      */
@@ -160,6 +166,18 @@ public class BusinessApplicationRequest implements Serializable {
     @ApiModelProperty(value = "反担保资料和评估报告")
     private String[] assessmentReport;
 
+    /**
+     * 谈话纪要
+     */
+    @ApiModelProperty(value = "谈话纪要")
+    private String[] conversationSummary;
+
+    /**
+     * 考察照片
+     */
+    @ApiModelProperty(value = "考察照片")
+    private String[] inspectionPhotos;
+
     /**
      * 区分保存和提交按钮  true->commit
      */

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationDetailResponse.java

@@ -26,7 +26,7 @@ public class BusinessApplicationDetailResponse implements Serializable {
      * 业务申请详细
      */
     @ApiModelProperty(value = "业务申请详细")
-    private DgApplyAmountInfo dgApplyAmountInfo;
+    private DgApplyAmountInfoResponse dgApplyAmountInfo;
 
     /**
      * 企业详细
@@ -38,7 +38,13 @@ public class BusinessApplicationDetailResponse implements Serializable {
      * 附件详细
      */
     @ApiModelProperty(value = "附件详细")
-    private DgEnclosureInfo dgEnclosureInfo;
+    private DgEnclosureInfoResponse dgEnclosureInfo;
+
+    /**
+     * 关联人信息列表
+     */
+    @ApiModelProperty(value = "关联人信息列表")
+    private LinkedHashMap linkedHashMap2;
 
 
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/BusinessApplicationListResponse.java

@@ -89,16 +89,23 @@ public class BusinessApplicationListResponse extends BaseRowModel implements Ser
     /**
      * 提单人
      */
-    @ExcelProperty(value = "提单人",index = 7)
+    @ExcelProperty(value = "提单人",index = 8)
     @ApiModelProperty(value = "提单人")
     private String account;
 
     /**
      * 部门名称
      */
-    @ExcelProperty(value = "部门名称",index = 8)
+    @ExcelProperty(value = "部门名称",index = 9)
     @ApiModelProperty(value = "部门名称")
     private String deptName;
 
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态",index = 7)
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
 
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgApplyAmountInfoResponse.java

@@ -0,0 +1,114 @@
+package com.daqing.financial.guarantee.model.response;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 申请贷款信息
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-05
+ */
+@Data
+public class DgApplyAmountInfoResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+
+    /**
+     * 提单人id
+     */
+    private Integer presenterId;
+
+    /**
+     * 申请额度
+     */
+    private BigDecimal applyAmount;
+
+    /**
+     * 申请期限
+     */
+    private String applyTime;
+
+    /**
+     * 贷款银行（用中划线隔开）
+     */
+    private String bank;
+
+    /**
+     * 贷款用途
+     */
+    private String amountWide;
+
+    /**
+     * 其他贷款用途
+     */
+    private String otherAmountWide;
+
+    /**
+     * 反担保措施（中划线隔开）
+     */
+    private List<String> enGuaranteeMeasure;
+
+    /**
+     * 反担保措施（中划线隔开）
+     */
+    private String enGuaranteeMeasures;
+
+    /**
+     * 业务类型
+     */
+    private String businessType;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 反担保措施描述
+     */
+    private String description;
+
+    /**
+     * 状态 1->审核中；2->已审核；3->拒绝；4->驳回；
+     */
+    private Integer status;
+
+    /**
+     * 审批人Id
+     */
+    private Integer approvalId;
+
+    /**
+     * 审批意见
+     */
+    private String remark;
+
+    /**
+     * 业务编号
+     */
+    private String businessCode;
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgEnclosureInfoResponse.java

@@ -0,0 +1,138 @@
+package com.daqing.financial.guarantee.model.response;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 申请贷款信息
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-05
+ */
+@Data
+public class DgEnclosureInfoResponse implements Serializable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 业务id
+     */
+    private Integer businessId;
+
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+
+    /**
+     * 营业执照复印件
+     */
+    private List<String> businessLicenseList;
+
+    /**
+     * 上传法定代表人夫妻及企业实际经营者身份证复印件
+     */
+    private List<String> legalCardCopyList;
+
+    /**
+     * 法定代表人夫妻户口本，结婚证（离婚证）复印件
+     */
+    private List<String> marriageCopyList;
+
+    /**
+     * 法定代表人身份证明
+     */
+    private List<String> legalCopyList;
+
+    /**
+     * 公司章程
+     */
+    private List<String> companyConstitutionList;
+
+    /**
+     * 会计师事务所审计的上一年度及本年度审计报告
+     */
+    private List<String> accountingFirmList;
+
+    /**
+     * 企业信用报告
+     */
+    private List<String> companyCreditList;
+
+    /**
+     * 企业法人夫妇信用报告，实际经营者信用报告
+     */
+    private List<String> creditReportList;
+
+    /**
+     * 征信业务授权书，承诺书
+     */
+    private List<String> certificateAuthorizationList;
+
+    /**
+     * 增值税纳税申报表首表复印件/完税证明
+     */
+    private List<String> taxCertificateList;
+
+    /**
+     * 股东会会议纪要
+     */
+    private List<String> meetingMinutesList;
+
+    /**
+     * 反担保资料和评估报告
+     */
+    private List<String> assessmentReportList;
+
+    /**
+     * 谈话纪要
+     */
+    private List<String> conversationSummaryList;
+
+    /**
+     * 考察照片
+     */
+    private List<String> inspectionPhotosList;
+
+    private String businessLicense;
+
+    private String legalCardCopy;
+
+    private String marriageCopy;
+
+    private String legalCopy;
+
+    private String companyConstitution;
+
+    private String accountingFirm;
+
+    private String companyCredit;
+
+    private String creditReport;
+
+    private String certificateAuthorization;
+
+    private String taxCertificate;
+
+    private String meetingMinutes;
+
+    private String assessmentReport;
+
+    private String conversationSummary;
+
+    private String inspectionPhotos;
+
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgGuaranteeInvestigationService.java

@@ -1,16 +0,0 @@
-package com.daqing.financial.guarantee.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.daqing.framework.domain.guarantee.DgGuaranteeInvestigation;
-
-/**
- * <p>
- * 担保调查 服务类
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-public interface IDgGuaranteeInvestigationService extends IService<DgGuaranteeInvestigation> {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -10,6 +10,8 @@ import com.daqing.financial.guarantee.mapper.DgEnclosureInfoMapper;
 import com.daqing.financial.guarantee.model.request.BusinessApplicationRequest;
 import com.daqing.financial.guarantee.model.response.BusinessApplicationDetailResponse;
 import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
+import com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse;
+import com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse;
 import com.daqing.financial.guarantee.service.IDgApplyAmountInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.framework.domain.crms.CrmsCustomerRelated;
@@ -23,6 +25,7 @@ import com.daqing.framework.domain.hrms.DeptEntity;
 import com.daqing.framework.domain.hrms.ext.EmployeeListVO;
 import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.response.ResponseResult;
+import com.daqing.framework.util.RandomUtil;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.excel.ExcelUtil;
@@ -39,9 +42,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -85,18 +86,20 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             log.error("LogAspect 操作失败：" + e.getMessage());
             e.printStackTrace();
         }
-        System.out.println("反担保措施======"+ArrayUtils.toString(businessApplication.getEnGuaranteeMeasures(),","));
+        System.out.println("反担保措施======"+ Arrays.toString(businessApplication.getEnGuaranteeMeasures()));
         //申请贷款相关信息
         DgApplyAmountInfo dgApplyAmountInfo = new DgApplyAmountInfo();
-        dgApplyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
+        dgApplyAmountInfo.setCompanyId(businessApplication.getCompanyId());
         dgApplyAmountInfo.setPresenterId(5);//Integer.parseInt(userId)
         dgApplyAmountInfo.setApplyAmount(businessApplication.getApplyAmount());//申请额度
         dgApplyAmountInfo.setApplyTime(businessApplication.getApplyTime());//申请期限
         dgApplyAmountInfo.setBank(businessApplication.getBank());//贷款银行
         dgApplyAmountInfo.setAmountWide(businessApplication.getAmountWide());//贷款用途
-        dgApplyAmountInfo.setEnGuaranteeMeasures(ArrayUtils.toString(businessApplication.getEnGuaranteeMeasures(),","));//反担保措施
+        dgApplyAmountInfo.setOtherAmountWide(businessApplication.getOtherAmountWide());//其他贷款用途
+        dgApplyAmountInfo.setEnGuaranteeMeasures(Arrays.toString(businessApplication.getEnGuaranteeMeasures()));//反担保措施
         dgApplyAmountInfo.setDescription(businessApplication.getDescription());//反担保措施描述
         dgApplyAmountInfo.setBusinessType(businessApplication.getBusinessType());//业务类型
+        dgApplyAmountInfo.setBusinessCode(RandomUtil.getRandomNum(12));
         dgApplyAmountInfo.setCreateTime(new Date());
         dgApplyAmountInfo.setUpdateTime(new Date());
         if(businessApplication.isSaveOrCommit()==true){
@@ -123,19 +126,20 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(dgApplyAmountInfo.getId());//业务id
         dgEnclosureInfo.setCompanyId(businessApplication.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(ArrayUtils.toString(businessApplication.getBusinessLicense(),","));//营业执照复印件
-        dgEnclosureInfo.setLegalCardCopy(ArrayUtils.toString(businessApplication.getLegalCardCopy(),","));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(ArrayUtils.toString(businessApplication.getMarriageCopy(),","));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(ArrayUtils.toString(businessApplication.getLegalCopy(),","));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(ArrayUtils.toString(businessApplication.getCompanyConstitution(),","));//公司章程
-        dgEnclosureInfo.setAccountingFirm(ArrayUtils.toString(businessApplication.getAccountingFirm(),","));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setCompanyCredit(ArrayUtils.toString(businessApplication.getCompanyCredit(),","));//企业信用报告
-        dgEnclosureInfo.setCreditReport(ArrayUtils.toString(businessApplication.getCreditReport(),","));//企业法人夫妇信用报告，实际经营者信用报告
-        dgEnclosureInfo.setCertificateAuthorization(ArrayUtils.toString(businessApplication.getCertificateAuthorization(),","));//征信业务授权书，承诺书
-        dgEnclosureInfo.setTaxCertificate(ArrayUtils.toString(businessApplication.getTaxCertificate(),","));//增值税纳税申报表首表复印件/完税证明
-        dgEnclosureInfo.setMeetingMinutes(ArrayUtils.toString(businessApplication.getMeetingMinutes(),","));//股东会会议纪要
-        dgEnclosureInfo.setAssessmentReport(ArrayUtils.toString(businessApplication.getAssessmentReport(),","));//反担保资料和评估报告
-
+        dgEnclosureInfo.setBusinessLicense(Arrays.toString(businessApplication.getBusinessLicense()));//营业执照复印件
+        dgEnclosureInfo.setLegalCardCopy(Arrays.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
+        dgEnclosureInfo.setMarriageCopy(Arrays.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
+        dgEnclosureInfo.setLegalCopy(Arrays.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
+        dgEnclosureInfo.setCompanyConstitution(Arrays.toString(businessApplication.getCompanyConstitution()));//公司章程
+        dgEnclosureInfo.setAccountingFirm(Arrays.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
+        dgEnclosureInfo.setCompanyCredit(Arrays.toString(businessApplication.getCompanyCredit()));//企业信用报告
+        dgEnclosureInfo.setCreditReport(Arrays.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
+        dgEnclosureInfo.setCertificateAuthorization(Arrays.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
+        dgEnclosureInfo.setTaxCertificate(Arrays.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
+        dgEnclosureInfo.setMeetingMinutes(Arrays.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
+        dgEnclosureInfo.setAssessmentReport(Arrays.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
+        dgEnclosureInfo.setConversationSummary(Arrays.toString(businessApplication.getConversationSummary()));
+        dgEnclosureInfo.setInspectionPhotos(Arrays.toString(businessApplication.getInspectionPhotos()));
         return dgEnclosureInfoMapper.insert(dgEnclosureInfo);
     }
 
@@ -156,7 +160,17 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
     @Override
     public BusinessApplicationDetailResponse businessApplicationDetail(Integer id) {
         //根据主键id查询业务申请详细信息
-        DgApplyAmountInfo dgApplyAmountInfo = this.baseMapper.selectById(id);
+        //DgApplyAmountInfo dgApplyAmountInfo = this.baseMapper.selectById(id);
+        DgApplyAmountInfoResponse dgApplyAmountInfo = this.baseMapper.selectApplyAmountInfoById(id);
+        String measures=dgApplyAmountInfo.getEnGuaranteeMeasures();
+        if(measures.length()>0){
+            String a = measures.substring(1,measures.length()-1);
+            String arry[]=a.split(",");
+            List<String> demoList = Arrays.asList(arry);
+            dgApplyAmountInfo.setEnGuaranteeMeasure(demoList);
+            System.out.println("arry==============="+demoList);
+        }
+
         System.out.println("业务申请详细========="+dgApplyAmountInfo);
 
         DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
@@ -165,20 +179,67 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
 
         LinkedHashMap linkedList = (LinkedHashMap)result.getData();
-/*        ObjectMapper mapper = new ObjectMapper();
-        List<LinkedHashMap> pojos = mapper.convertValue(linkedList, new TypeReference<List<LinkedHashMap>>() {});*/
-
         System.out.println("企业详细============"+linkedList);
 
         //查询附件详细，附件关联业务主键id
-        DgEnclosureInfo dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(id);
+        DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(id);
+
+        List<String>list = new ArrayList<>();
+        list.add(dgEnclosureInfo.getAccountingFirm());
+        list.add(dgEnclosureInfo.getAssessmentReport());
+        list.add(dgEnclosureInfo.getBusinessLicense());
+        list.add(dgEnclosureInfo.getCertificateAuthorization());
+        list.add(dgEnclosureInfo.getCompanyConstitution());
+        list.add(dgEnclosureInfo.getCompanyCredit());
+        list.add(dgEnclosureInfo.getConversationSummary());
+        list.add(dgEnclosureInfo.getCreditReport());
+        list.add(dgEnclosureInfo.getInspectionPhotos());
+        list.add(dgEnclosureInfo.getLegalCardCopy());
+        list.add(dgEnclosureInfo.getLegalCopy());
+        list.add(dgEnclosureInfo.getTaxCertificate());
+        list.add(dgEnclosureInfo.getMeetingMinutes());
+        list.add(dgEnclosureInfo.getMarriageCopy());
+
+        List arr1List2 = new ArrayList<>();
+
+        for(int i=0;i<list.size();i++){
+            if(list.get(i).length()>0){
+                String a1 = list.get(i).substring(1,list.get(i).length()-1);
+                String arr1[]=a1.split(",");
+                List<String> arr1List = Arrays.asList(arr1);
+                arr1List2.add(i,arr1List);
+
+            }
+        }
+        dgEnclosureInfo.setAccountingFirmList((List<String>) arr1List2.get(0));
+        dgEnclosureInfo.setAssessmentReportList((List<String>) arr1List2.get(1));
+        dgEnclosureInfo.setBusinessLicenseList((List<String>) arr1List2.get(2));
+        dgEnclosureInfo.setCertificateAuthorizationList((List<String>) arr1List2.get(3));
+        dgEnclosureInfo.setCompanyConstitutionList((List<String>) arr1List2.get(4));
+        dgEnclosureInfo.setCompanyCreditList((List<String>) arr1List2.get(5));
+        dgEnclosureInfo.setConversationSummaryList((List<String>) arr1List2.get(6));
+        dgEnclosureInfo.setCreditReportList((List<String>) arr1List2.get(7));
+        dgEnclosureInfo.setInspectionPhotosList((List<String>) arr1List2.get(8));
+        dgEnclosureInfo.setLegalCardCopyList((List<String>) arr1List2.get(9));
+        dgEnclosureInfo.setLegalCopyList((List<String>) arr1List2.get(10));
+        dgEnclosureInfo.setTaxCertificateList((List<String>) arr1List2.get(11));
+        dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
+        dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
+
         System.out.println("附件详细=============="+dgEnclosureInfo);
 
+/*        int page=1;
+        int size=10;
+        //关联人信息列表展示
+        ResponseResult list = crmsFeignService.companyPersonalList(page,size,dgApplyAmountInfo.getCompanyId());
+        LinkedHashMap personalList = (LinkedHashMap)list.getData();
+        System.out.println("关联人信息列表======================="+personalList);*/
+
         BusinessApplicationDetailResponse businessApplicationDetail= new BusinessApplicationDetailResponse();
         businessApplicationDetail.setDgApplyAmountInfo(dgApplyAmountInfo);
         businessApplicationDetail.setDgEnclosureInfo(dgEnclosureInfo);
         businessApplicationDetail.setLinkedHashMap(linkedList);
-
+        //businessApplicationDetail.setLinkedHashMap2(personalList);
         return businessApplicationDetail;
     }
 
@@ -192,7 +253,8 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgApplyAmountInfo.setApplyTime(businessApplication.getApplyTime());//申请期限
         dgApplyAmountInfo.setBank(businessApplication.getBank());//贷款银行
         dgApplyAmountInfo.setAmountWide(businessApplication.getAmountWide());//贷款用途
-        dgApplyAmountInfo.setEnGuaranteeMeasures(ArrayUtils.toString(businessApplication.getEnGuaranteeMeasures(),","));//反担保措施
+        dgApplyAmountInfo.setOtherAmountWide(businessApplication.getOtherAmountWide());//其他贷款用途
+        dgApplyAmountInfo.setEnGuaranteeMeasures(Arrays.toString(businessApplication.getEnGuaranteeMeasures()));//反担保措施
         dgApplyAmountInfo.setDescription(businessApplication.getDescription());//反担保措施描述
         dgApplyAmountInfo.setBusinessType(businessApplication.getBusinessType());//业务类型
         dgApplyAmountInfo.setUpdateTime(new Date());
@@ -203,19 +265,20 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgEnclosureInfo dgEnclosureInfo = new DgEnclosureInfo();
         dgEnclosureInfo.setBusinessId(businessApplication.getId());//业务id
         dgEnclosureInfo.setCompanyId(businessApplication.getCompanyId());//企业Id
-        dgEnclosureInfo.setBusinessLicense(ArrayUtils.toString(businessApplication.getBusinessLicense(),","));//营业执照复印件
-        dgEnclosureInfo.setLegalCardCopy(ArrayUtils.toString(businessApplication.getLegalCardCopy(),","));//上传法定代表人夫妻及企业实际经营者身份证复印件
-        dgEnclosureInfo.setMarriageCopy(ArrayUtils.toString(businessApplication.getMarriageCopy(),","));//法定代表人夫妻户口本，结婚证（离婚证）复印件
-        dgEnclosureInfo.setLegalCopy(ArrayUtils.toString(businessApplication.getLegalCopy(),","));//法定代表人身份证明
-        dgEnclosureInfo.setCompanyConstitution(ArrayUtils.toString(businessApplication.getCompanyConstitution(),","));//公司章程
-        dgEnclosureInfo.setAccountingFirm(ArrayUtils.toString(businessApplication.getAccountingFirm(),","));//会计师事务所审计的上一年度及本年度审计报告
-        dgEnclosureInfo.setCompanyCredit(ArrayUtils.toString(businessApplication.getCompanyCredit(),","));//企业信用报告
-        dgEnclosureInfo.setCreditReport(ArrayUtils.toString(businessApplication.getCreditReport(),","));//企业法人夫妇信用报告，实际经营者信用报告
-        dgEnclosureInfo.setCertificateAuthorization(ArrayUtils.toString(businessApplication.getCertificateAuthorization(),","));//征信业务授权书，承诺书
-        dgEnclosureInfo.setTaxCertificate(ArrayUtils.toString(businessApplication.getTaxCertificate(),","));//增值税纳税申报表首表复印件/完税证明
-        dgEnclosureInfo.setMeetingMinutes(ArrayUtils.toString(businessApplication.getMeetingMinutes(),","));//股东会会议纪要
-        dgEnclosureInfo.setAssessmentReport(ArrayUtils.toString(businessApplication.getAssessmentReport(),","));//反担保资料和评估报告
-
+        dgEnclosureInfo.setBusinessLicense(Arrays.toString(businessApplication.getBusinessLicense()));//营业执照复印件
+        dgEnclosureInfo.setLegalCardCopy(Arrays.toString(businessApplication.getLegalCardCopy()));//上传法定代表人夫妻及企业实际经营者身份证复印件
+        dgEnclosureInfo.setMarriageCopy(Arrays.toString(businessApplication.getMarriageCopy()));//法定代表人夫妻户口本，结婚证（离婚证）复印件
+        dgEnclosureInfo.setLegalCopy(Arrays.toString(businessApplication.getLegalCopy()));//法定代表人身份证明
+        dgEnclosureInfo.setCompanyConstitution(Arrays.toString(businessApplication.getCompanyConstitution()));//公司章程
+        dgEnclosureInfo.setAccountingFirm(Arrays.toString(businessApplication.getAccountingFirm()));//会计师事务所审计的上一年度及本年度审计报告
+        dgEnclosureInfo.setCompanyCredit(Arrays.toString(businessApplication.getCompanyCredit()));//企业信用报告
+        dgEnclosureInfo.setCreditReport(Arrays.toString(businessApplication.getCreditReport()));//企业法人夫妇信用报告，实际经营者信用报告
+        dgEnclosureInfo.setCertificateAuthorization(Arrays.toString(businessApplication.getCertificateAuthorization()));//征信业务授权书，承诺书
+        dgEnclosureInfo.setTaxCertificate(Arrays.toString(businessApplication.getTaxCertificate()));//增值税纳税申报表首表复印件/完税证明
+        dgEnclosureInfo.setMeetingMinutes(Arrays.toString(businessApplication.getMeetingMinutes()));//股东会会议纪要
+        dgEnclosureInfo.setAssessmentReport(Arrays.toString(businessApplication.getAssessmentReport()));//反担保资料和评估报告
+        dgEnclosureInfo.setConversationSummary(Arrays.toString(businessApplication.getConversationSummary()));
+        dgEnclosureInfo.setInspectionPhotos(Arrays.toString(businessApplication.getInspectionPhotos()));
 
         //根据业务id删除对应的附件信息
         dgEnclosureInfoMapper.delete(new QueryWrapper<DgEnclosureInfo>().eq("business_id",businessApplication.getId()));
@@ -247,7 +310,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             e.printStackTrace();
         }
         //根据userId获取用户名以及部门名称
-        ResponseResult<EmployeeMessageResponse> employeeMessage = hrmsFeignService.getAccountAndDeptNameById(5l);
+        ResponseResult<EmployeeMessageResponse> employeeMessage = hrmsFeignService.getAccountAndDeptNameById(Long.valueOf(userId));
 
         try {
             List<BusinessApplicationListResponse> list = this.getBaseMapper().excelList();

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeInvestigationServiceImpl.java

@@ -1,20 +0,0 @@
-package com.daqing.financial.guarantee.service.impl;
-
-import com.daqing.financial.guarantee.mapper.DgGuaranteeInvestigationMapper;
-import com.daqing.financial.guarantee.service.IDgGuaranteeInvestigationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.daqing.framework.domain.guarantee.DgGuaranteeInvestigation;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 担保调查 服务实现类
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@Service
-public class DgGuaranteeInvestigationServiceImpl extends ServiceImpl<DgGuaranteeInvestigationMapper, DgGuaranteeInvestigation> implements IDgGuaranteeInvestigationService {
-
-}

dq-financial-guarantee/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 #服务名称
 spring.application.name=dq-financial-guarantee
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.142:8848
+spring.cloud.nacos.config.server-addr=192.168.31.140:8848
 spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60
 #spring.cloud.nacos.config.group=prod
 

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml

@@ -38,4 +38,8 @@
         left join crms_customer cc on cc.id = ccl.customer_id
     </select>
 
+    <select id="selectApplyAmountInfoById" resultType="com.daqing.financial.guarantee.model.response.DgApplyAmountInfoResponse">
+        select * from dg_apply_amount_info where id=#{id}
+    </select>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgEnclosureInfoMapper.xml

@@ -21,7 +21,7 @@
         <result column="assessment_report" property="assessmentReport" />
     </resultMap>
 
-    <select id="selectByCompanyId" resultType="com.daqing.framework.domain.guarantee.DgEnclosureInfo">
+    <select id="selectByCompanyId" resultType="com.daqing.financial.guarantee.model.response.DgEnclosureInfoResponse">
         select * from dg_enclosure_info where business_id=#{id}
     </select>
 

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeInvestigationMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.daqing.financial.guarantee.mapper.DgGuaranteeInvestigationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgGuaranteeInvestigation">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="emp_id" property="empId" />
-        <result column="business_license" property="businessLicense" />
-        <result column="legal_card_copy" property="legalCardCopy" />
-        <result column="marriage_copy" property="marriageCopy" />
-        <result column="legal_copy" property="legalCopy" />
-        <result column="company_constitution" property="companyConstitution" />
-        <result column="accounting_firm" property="accountingFirm" />
-        <result column="meeting_minutes" property="meetingMinutes" />
-        <result column="conversation" property="conversation" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-</mapper>

dq-financial-hrms-auth/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 # 开发和测试环境（dev）
 spring.application.name=dq-financial-hrms-auth
 
-spring.cloud.nacos.config.server-addr=192.168.31.142:8848
+spring.cloud.nacos.config.server-addr=192.168.31.140:8848
 spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8
 #spring.cloud.nacos.config.group=prod
 

dq-financial-hrms/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 #服务名称
 spring.application.name=dq-financial-hrms
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.142:8848
+spring.cloud.nacos.config.server-addr=192.168.31.140:8848
 spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6
 #spring.cloud.nacos.config.group=prod
 

dq-framework-model/src/main/java/com/daqing/framework/domain/crms/response/CompanyCustomerResponse.java

@@ -73,6 +73,11 @@ public class CompanyCustomerResponse implements Serializable {
 	 */
 	@ApiModelProperty(value = "业务来源")
 	private String businessSource;
+	/**
+	 * 是否存在关联人
+	 */
+	@ApiModelProperty(value = "是否存在关联人")
+	private Integer isExistRelated;
 	/**
 	 * 客户基本信息表id
 	 */

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java

@@ -58,6 +58,11 @@ public class DgApplyAmountInfo implements Serializable {
      */
     private String amountWide;
 
+    /**
+     * 其他贷款用途
+     */
+    private String otherAmountWide;
+
     /**
      * 反担保措施（中划线隔开）
      */
@@ -96,4 +101,9 @@ public class DgApplyAmountInfo implements Serializable {
      */
     private String remark;
 
+    /**
+     * 业务编号
+     */
+    private String businessCode;
+
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgEnclosureInfo.java

@@ -96,4 +96,14 @@ public class DgEnclosureInfo implements Serializable {
      * 反担保资料和评估报告
      */
     private String assessmentReport;
+
+    /**
+     * 谈话纪要
+     */
+    private String conversationSummary;
+
+    /**
+     * 考察照片
+     */
+    private String inspectionPhotos;
 }

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgGuaranteeInvestigation.java

@@ -1,87 +0,0 @@
-package com.daqing.framework.domain.guarantee;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 担保调查
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@Data
-@TableName("dg_guarantee_investigation")
-public class DgGuaranteeInvestigation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 企业id
-     */
-    private Integer companyId;
-
-    /**
-     * 调查者id
-     */
-    private Integer empId;
-
-    /**
-     * 营业执照复印件
-     */
-    private String businessLicense;
-
-    /**
-     * 上传法定代表人夫妻及企业实际经营者身份证复印件
-     */
-    private String legalCardCopy;
-
-    /**
-     * 法定代表人夫妻户口本，结婚证（离婚证）复印件
-     */
-    private String marriageCopy;
-
-    /**
-     * 法定代表人身份证明
-     */
-    private String legalCopy;
-
-    /**
-     * 公司章程
-     */
-    private String companyConstitution;
-
-    /**
-     * 会计师事务所审计的上一年度及本年度审计报告
-     */
-    private String accountingFirm;
-
-    /**
-     * 股东会会议纪要
-     */
-    private String meetingMinutes;
-
-    /**
-     * 谈话纪要
-     */
-    private String conversation;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-}

dq-govern-gateway/src/main/resources/bootstrap.properties

@@ -1,7 +1,7 @@
 #服务名称
 spring.application.name=dq-govern-gateway
 #配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.142:8848
+spring.cloud.nacos.config.server-addr=192.168.31.140:8848
 spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25
 
 spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml