update

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CustomerInfoController.java

@@ -6,10 +6,10 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.poi.ExcelUtil;
-import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
 import com.dsk.cscec.domain.bo.CustomerInfoBo;
 import com.dsk.cscec.domain.vo.AdvisoryBodyVo;
+import com.dsk.cscec.domain.vo.CustomerApproveVo;
 import com.dsk.cscec.domain.vo.CustomerInfoVo;
 import com.dsk.cscec.service.ICustomerInfoService;
 import lombok.RequiredArgsConstructor;
@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**
@@ -64,9 +63,9 @@ public class CustomerInfoController extends BaseController {
     /**
      * 合作记录-供应商准入情况
      */
-    @GetMapping("/getByName/{name}")
-    public R<DCustomer> list(@NotEmpty(message = "企业名称不能为空") @PathVariable String name) {
-        return R.ok(iCustomerInfoService.queryByName(name));
+    @GetMapping("/getApproveInfo")
+    public R<CustomerApproveVo> getApproveInfo(CustomerInfoBo bo) {
+        return R.ok(iCustomerInfoService.queryApproveByBo(bo));
     }
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CustomerInfoBo.java

@@ -17,6 +17,14 @@ import java.util.List;
  */
 @Data
 public class CustomerInfoBo extends BaseEntity {
+    /**
+     * 客商主键
+     */
+    private Long customerKey;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifySocialCode;
     /**
      * 供应商类别(分供,劳务分包,专业分包,租赁,劳务分包队伍)
      */

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 lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 供应商准入情况
+ *
+ * @author
+ * @since 2023-12-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class CustomerApproveVo {
+
+    /**
+     * 客商主键
+     */
+    private Long customerKey;
+    /**
+     * 供应商编号
+     */
+    private String customerCode;
+    /**
+     * 供应商名称
+     */
+    private String customerName;
+    /**
+     * 注册资金
+     */
+    private Double registerCapital;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifySocialCode;
+    /**
+     * 工商注册号
+     */
+    private String registerNo;
+    /**
+     * 组织机构代码号
+     */
+    private String orgnizationCode;
+    /**
+     * 税务登记号
+     */
+    private String businessLicense;
+    /**
+     * 身份信息选择
+     */
+    private String cardType;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 纳税人身份
+     */
+    private String paytaxType;
+    /**
+     * 纳税人税率
+     */
+    private String taxRate;
+    /**
+     * 法人代表
+     */
+    private String representative;
+    /**
+     * 联系人
+     */
+    private String contactPerson;
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+    /**
+     * 业主性质
+     */
+    private String ownerKind;
+    /**
+     * 资质等级
+     */
+    private String credential;
+    /**
+     * 施工承包范围
+     */
+    private String constructJobScope;
+    /**
+     * 专业类别id
+     */
+    private String groupSpecialtyId;
+    /**
+     * 集团专业类别
+     */
+    private String groupSpecialty;
+    /**
+     * 城市id
+     */
+    private String registerCityId;
+    /**
+     * 注册地区域
+     */
+    private String registerRegion;
+    /**
+     * 省份
+     */
+    private String registerProvince;
+    /**
+     * 城市
+     */
+    private String registerCity;
+    /**
+     * 企业注册地
+     */
+    private String registerAddress;
+    /**
+     * 开户行
+     */
+    private String openBank;
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * 主营业务
+     */
+    private String primaryBusiness;
+    /**
+     * 税号
+     */
+    private String taxNumber;
+    /**
+     * 企业性质
+     */
+    private String customerProperty;
+
+    //证书信息
+    /**
+     * 营业执照到期时间1
+     */
+    private Date expireDate1;
+    /**
+     * 组织机构代码证到期时间2
+     */
+    private Date expireDate2;
+    /**
+     * 税务登记证到期时间3
+     */
+    private Date expireDate3;
+    /**
+     * 资质证书到期时间4
+     */
+    private Date expireDate4;
+    /**
+     * 安全生产许可证到期时间5
+     */
+    private Date expireDate5;
+    /**
+     * 施工队长资格证到期时间6
+     */
+    private String expireDate6;
+    /**
+     * 授权委托书到期时间7
+     */
+    private String expireDate7;
+    //审批意见
+    /**
+     * 经办人
+     */
+    private String responsiblePerson;
+    /**
+     * 经办人签字时间
+     */
+    private Date approveDate1;
+    /**
+     * 商务经理
+     */
+    private String businessManager;
+    /**
+     * 商务经理签字时间
+     */
+    private Date approveDate3;
+    /**
+     * 项目经理
+     */
+    private String projectManager;
+    /**
+     * 项目经理签字时间
+     */
+    private Date approveDate4;
+    /**
+     * 采购部门负责人/公司意见
+     */
+    private String purchasePrincipal;
+    /**
+     * 准入时间
+     */
+    private Date approveDate2;
+}
+

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

@@ -7,6 +7,7 @@ import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
 import com.dsk.cscec.domain.bo.CustomerInfoBo;
 import com.dsk.cscec.domain.vo.AdvisoryBodyVo;
+import com.dsk.cscec.domain.vo.CustomerApproveVo;
 import com.dsk.cscec.domain.vo.CustomerInfoVo;
 
 /**
@@ -19,7 +20,7 @@ public interface ICustomerInfoService extends IService<DCustomer> {
 
     TableDataInfo<CustomerInfoVo> queryPageList(CustomerInfoBo bo, PageQuery query);
 
-    DCustomer queryByName(String name);
+    CustomerApproveVo queryApproveByBo(CustomerInfoBo bo);
 
     TableDataInfo<AdvisoryBodyVo> queryAdvisoryList(AdvisoryBodyBo bo, PageQuery query);
 }

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

 package com.dsk.cscec.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,12 +16,14 @@ import com.dsk.cscec.domain.DCustomer;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
 import com.dsk.cscec.domain.bo.CustomerInfoBo;
 import com.dsk.cscec.domain.vo.AdvisoryBodyVo;
+import com.dsk.cscec.domain.vo.CustomerApproveVo;
 import com.dsk.cscec.domain.vo.CustomerInfoVo;
 import com.dsk.cscec.mapper.AdvisoryBodyMapper;
 import com.dsk.cscec.mapper.DCustomerMapper;
 import com.dsk.cscec.mapper.DSubcontractMapper;
 import com.dsk.cscec.service.ICustomerInfoService;
 import com.dsk.search.service.BusinessOpportunityRadarService;
+import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -76,12 +80,19 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
     }
 
     @Override
-    public DCustomer queryByName(String name) {
+    public CustomerApproveVo queryApproveByBo(CustomerInfoBo bo) {
+        if(ObjectUtil.isNull(bo.getCustomerKey()) && StringUtil.isBlank(bo.getCustomerName()) && StringUtil.isBlank(bo.getUnifySocialCode())){
+            Assert.isTrue(false,"参数不能为空");
+        }
         LambdaQueryWrapper<DCustomer> lqw = Wrappers.lambdaQuery();
-        lqw.eq(DCustomer::getCustomerName,name);
+        lqw.eq(ObjectUtil.isNotNull(bo.getCustomerKey()),DCustomer::getCustomerKey,bo.getCustomerKey());
+        lqw.eq(StringUtil.isNotBlank(bo.getUnifySocialCode()),DCustomer::getUnifySocialCode,bo.getUnifySocialCode());
+        lqw.eq(StringUtil.isNotBlank(bo.getCustomerName()),DCustomer::getCustomerName,bo.getCustomerName());
         lqw.orderByDesc(DCustomer::getApproveDate2);
         lqw.last("limit 1");
-        return baseMapper.selectOne(lqw);
+        DCustomer dCustomer = baseMapper.selectOne(lqw);
+        CustomerApproveVo vo = BeanUtil.toBean(dCustomer, CustomerApproveVo.class);
+        return vo;
     }
 
     @Override