update

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CustomerApproveVo.java

 package com.dsk.cscec.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 供应商准入情况
@@ -31,6 +33,9 @@ public class CustomerApproveVo {
      * 注册资金
      */
     private Double registerCapital;
+    /**
+     * 证件选择
+     */
     /**
      * 统一社会信用代码
      */
@@ -63,6 +68,9 @@ public class CustomerApproveVo {
      * 纳税人税率
      */
     private String taxRate;
+    /**
+     * 享受优惠政策说明
+     */
     /**
      * 法人代表
      */
@@ -75,6 +83,9 @@ public class CustomerApproveVo {
      * 联系电话
      */
     private String contactPhone;
+    /**
+     * 主项资质
+     */
     /**
      * 业主性质
      */
@@ -166,6 +177,42 @@ public class CustomerApproveVo {
      * 授权委托书到期时间7
      */
     private String expireDate7;
+    /**
+     *营业执照url
+     */
+    private List<CertificateVo> businessLicenseList;
+    /**
+     * 组织机构代码证url
+     */
+    private List<CertificateVo> orgCertificateList;
+    /**
+     * 税务登记证url
+     */
+    private List<CertificateVo> taxCertificateList;
+    /**
+     * 资质证书url
+     */
+    private List<CertificateVo> qualificationCertificateList;
+    /**
+     * 安全生产url
+     */
+    private List<CertificateVo> safetyCertificateList;
+    /**
+     * 增值税一般纳税人资格证明url
+     */
+    private List<CertificateVo> ratepayerCertificateList;
+    /**
+     * 业绩报告url
+     */
+    private List<CertificateVo> performanceCertificateList;
+    /**
+     * 考察报告url
+     */
+    private List<CertificateVo> inspectionCertificateList;
+    /**
+     * 其他url
+     */
+    private List<CertificateVo> otherCertificateList;
     //审批意见
     /**
      * 是否同意准入/准入情况

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java

@@ -85,7 +85,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                         item.setCompanyId(companyId);
                     }
                 }catch (Exception e){
-                    //
+                    log.error("CustomerInfoServiceImpl.queryPageList() error:" + e);
                 }
             });
         }
@@ -105,6 +105,27 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
         lqw.orderByDesc(DCustomer::getApproveDate2);
         lqw.last("limit 1");
         DCustomer dCustomer = baseMapper.selectOne(lqw);
+        if(ObjectUtil.isNotEmpty(dCustomer)){
+            //营业执照url
+            dCustomer.setBusinessLicenseList(baseMapper.selectBusinessLicense(dCustomer.getCustomerId()));
+            //组织机构代码证url
+            dCustomer.setOrgCertificateList(baseMapper.selectOrgCertificate(dCustomer.getCustomerId()));
+            //税务登记证url
+            dCustomer.setTaxCertificateList(baseMapper.selectTaxCertificate(dCustomer.getCustomerId()));
+            //资质证书url
+            dCustomer.setQualificationCertificateList(baseMapper.selectQualificationCertificate(dCustomer.getCustomerId()));
+            //安全生产url
+            dCustomer.setSafetyCertificateList(baseMapper.selectSafetyCertificate(dCustomer.getCustomerId()));
+            //增值税一般纳税人资格证明url
+//            dCustomer.setRatepayerCertificateList(baseMapper.selectRatepayerCertificate(dCustomer.getCustomerId()));
+            //业绩报告url
+            dCustomer.setPerformanceCertificateList(baseMapper.selectPerformanceCertificate(dCustomer.getCustomerId()));
+            //考察报告url
+            dCustomer.setInspectionCertificateList(baseMapper.selectInspectionCertificate(dCustomer.getCustomerId()));
+            //其他url
+            dCustomer.setOtherCertificateList(baseMapper.selectOtherCertificate(dCustomer.getCustomerId()));
+
+        }
         CustomerApproveVo vo = BeanUtil.toBean(dCustomer, CustomerApproveVo.class);
         return vo;
     }