施工业绩接口

dsk-admin/src/main/resources/application-test.yml

@@ -111,6 +111,7 @@ spring:
 #    password: zfTFIJjaN#6xB83r
 
     host: 172.17.0.12
+    port: 6379
     database: 13
     # 密码
     password: DskSzhRedis!789

dsk-admin/src/main/resources/application.yml

@@ -211,6 +211,7 @@ tenant:
     - f_supplier_limited_relieve
     - d_customer_class
     - d_contract
+    - d_sgyj
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

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

@@ -10,10 +10,7 @@ import com.dsk.cscec.domain.bo.AddDCustomerLaborLeaderBo;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
 import com.dsk.cscec.domain.bo.CustomerCooperationBo;
 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.CustomerCooperationVo;
-import com.dsk.cscec.domain.vo.CustomerInfoVo;
+import com.dsk.cscec.domain.vo.*;
 import com.dsk.cscec.service.ICustomerInfoService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -80,6 +77,15 @@ public class CustomerInfoController extends BaseController {
         return R.ok(iCustomerInfoService.queryApproveByBo(bo));
     }
 
+    /**
+     * 准入情况-施工业绩
+     */
+    @PostMapping("/sgyjList")
+    public R<List<DSgyjVo>> sgyjList(CustomerInfoBo bo) {
+        return R.ok(iCustomerInfoService.sgyjList(bo));
+    }
+
+
     /**
      * 内部合作-供应商合作记录
      */

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

@@ -578,5 +578,29 @@ public class DCustomer implements Serializable {
      */
     @TableField(exist = false)
     private List<CertificateVo> otherCertificateList;
+
+
+
+    /**
+     * 主项资质
+     */
+    private String mainAptitude;
+    /**
+     * 资源平台分类
+     */
+    private String resourcePlatformClassify;
+
+    /**
+     * 证件选择
+     */
+    private String certificateChoice;
+
+    /**
+     * 上传证书及其他信息
+     */
+    private String uploadCertificates;
+
+
+
 }
 

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

@@ -250,5 +250,68 @@ public class CustomerApproveVo {
      * 准入时间
      */
     private Date approveDate2;
+
+
+
+    /**
+     * 主项资质
+     */
+    private String mainAptitude;
+    /**
+     * 资源平台分类
+     */
+    private String resourcePlatformClassify;
+
+    /**
+     * 证件选择
+     */
+    private String certificateChoice;
+
+    /**
+     * 享受优惠政策
+     */
+    private String remark;
+
+
+    /**
+     * 组织机构代码
+     */
+    private List<UploadCertificatesMsgVo> zzjgdmList;
+
+
+    /**
+     * 税务登记证
+     */
+    private List<UploadCertificatesMsgVo> swdjList;
+
+
+
+    /**
+     * 资质证书
+     */
+    private List<UploadCertificatesMsgVo> zzzsList;
+
+
+    /**
+     * 安全生产
+     */
+    private List<UploadCertificatesMsgVo> aqscList;
+
+    /**
+     * 增值税一般纳税人资格证明
+     */
+    private List<UploadCertificatesMsgVo> zzsybnsrzgList;
+
+    /**
+     * 业绩报告
+     */
+    private List<UploadCertificatesMsgVo> yjbgList;
+
+    /**
+     * 考察报告
+     */
+    private List<UploadCertificatesMsgVo> kcbgList;
+
+
 }
 

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

@@ -192,4 +192,9 @@ public class DCustomerListVo implements Serializable {
      */
     private Long limitedCount = 0L;
 
+    /**
+     * 资源平台分类
+     */
+    private String resourcePlatformClassify;
+
 }

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

+package com.dsk.cscec.domain.vo;
+
+
+import lombok.Data;
+
+
+
+
+/**
+ * 施工业绩
+ *
+ * @author
+ * @since 2023-12-14
+ */
+@Data
+public class DSgyjVo {
+    /**
+     * 主键Id
+     */
+    private String fid;
+
+    /**
+     * 版本
+     */
+    private Long version;
+
+
+    /**
+     * 年度
+     */
+    private Long fyear;
+
+    /**
+     * 所在区域
+     */
+    private String fregistrationplace;
+    /**
+     * 所属省份
+     */
+    private String fprovince;
+
+    /**
+     * 所属市
+     */
+    private String fcity;
+
+
+    /**
+     * 施工面积（平方米）
+     */
+    private Long fareasum;
+
+
+    /**
+     * 年施工产值
+     */
+    private Long fincomeofyear;
+
+
+    /**
+     * 标志性工程名称
+     */
+    private String fprojectname;
+
+
+    /**
+     * 所获荣誉
+     */
+    private String fhonor;
+
+    /**
+     * 备注说明
+     */
+    private String fremark;
+
+    /**
+     * 关联客商ID与d_customer中的customer
+     */
+    private String fmasterid;
+
+    /**
+     * 考察公司
+     */
+    private String fkcognname;
+
+}

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

+package com.dsk.cscec.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @Description:上传证书及其他信息实体
+ * @Author: flx
+ * @date: 2024-07-12
+ * @return
+ */
+@Data
+public class UploadCertificatesMsgVo {
+
+    /**
+     *证书名称
+     */
+    private String name;
+
+    /**
+     *到期时间
+     */
+    private String expireTime;
+
+    /**
+     *状态
+     */
+    private String status = "未过期";
+
+    /**
+     *附件
+     */
+    private String link;
+
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DCustomerDetailMapper.java

+package com.dsk.cscec.mapper;
+
+
+import com.dsk.cscec.domain.vo.DSgyjVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+public interface DCustomerDetailMapper{
+
+//    List<DSgyjVo> getSgyMsg(@Param("customerName") String customerName);
+
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DsgyjMapper.java

+package com.dsk.cscec.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.dsk.cscec.domain.vo.DSgyjVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+public interface DsgyjMapper extends BaseMapper<DSgyjVo>{
+
+    List<DSgyjVo> getSgyMsg(@Param("customerName") String customerName);
+
+
+}

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

@@ -8,10 +8,7 @@ import com.dsk.cscec.domain.bo.AddDCustomerLaborLeaderBo;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
 import com.dsk.cscec.domain.bo.CustomerCooperationBo;
 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.CustomerCooperationVo;
-import com.dsk.cscec.domain.vo.CustomerInfoVo;
+import com.dsk.cscec.domain.vo.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -45,6 +42,14 @@ public interface ICustomerInfoService extends IService<DCustomer> {
      */
     CustomerApproveVo queryApproveByBo(CustomerInfoBo bo);
 
+    /**
+     * 供应商准入情况
+     * @param bo
+     * @return
+     */
+    List<DSgyjVo> sgyjList(CustomerInfoBo bo);
+
+
     /**
      * 咨询机构合作记录
      * @param bo

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

@@ -25,6 +25,7 @@ import com.dsk.cscec.domain.vo.*;
 import com.dsk.cscec.mapper.AdvisoryBodyMapper;
 import com.dsk.cscec.mapper.DCustomerMapper;
 import com.dsk.cscec.mapper.DSubcontractMapper;
+import com.dsk.cscec.mapper.DsgyjMapper;
 import com.dsk.cscec.service.ICustomerInfoService;
 import com.dsk.search.service.BusinessOpportunityRadarService;
 import jodd.util.StringUtil;
@@ -57,6 +58,9 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
     @Resource
     private DSubcontractMapper dSubcontractMapper;
 
+    @Resource
+    private DsgyjMapper dsgyjMapper;
+
     @Override
     public TableDataInfo<CustomerInfoVo> queryPageList(CustomerInfoBo bo, PageQuery query) {
         List<String> customerStateList = Arrays.asList("合格");
@@ -161,6 +165,22 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
         }
     }
 
+
+    @Override
+    public List<DSgyjVo> sgyjList(CustomerInfoBo bo) {
+        String customerName = bo.getCustomerName();
+        if (StringUtils.isBlank(customerName)){
+            throw new ServiceException("考察公司名称不能为空");
+        }
+        List<DSgyjVo> dSgyjVos = dsgyjMapper.getSgyMsg(customerName);
+        return dSgyjVos;
+    }
+
+
+
+
+
+
     @Override
     public CustomerApproveVo queryApproveByBo(CustomerInfoBo bo) {
         if (ObjectUtil.isNull(bo.getCustomerKey()) && StringUtil.isBlank(bo.getCustomerName()) && StringUtil.isBlank(bo.getUnifySocialCode())) {
@@ -172,7 +192,7 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
         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");
+//        lqw.last("limit 1");
         DCustomer dCustomer = baseMapper.selectOne(lqw);
         if (ObjectUtil.isNotEmpty(dCustomer)) {
             //营业执照url
@@ -196,6 +216,27 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
 
         }
         CustomerApproveVo vo = BeanUtil.toBean(dCustomer, CustomerApproveVo.class);
+
+//        if(ObjectUtil.isNotEmpty(dCustomer) && StringUtil.isNotBlank(dCustomer.getCustomerId())){
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//        }
+
+
+
+
+
+
+
+
+
         return vo;
     }
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DCustomerDetailMapper.xml

+<?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.dsk.cscec.mapper.DCustomerDetailMapper">
+
+<!--    <select id="getSgyMsg" resultType="com.dsk.cscec.domain.vo.UploadCertificatesMsgVo">-->
+<!--        select a.* from d_sgyj a LEFT JOIN  d_customer b  on a.fmasterid = b.customer_id-->
+
+<!--        where b.cusomer_name = #{customerName}-->
+
+<!--    </select>-->
+
+
+</mapper>

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DCustomerMapper.xml

@@ -77,7 +77,7 @@
         select
             dc.customer_key, dc.customer_id, dc.customer_code, dc.customer_name, dc.recommend_org, dc.register_region, dc.register_province, dc.register_city, dc.customer_class, dc.primary_business,
             dc.paytax_type, dc.tax_rate, dc.customer_state, dc.leader_name, dc.labor_captain_phone, dc.labor_captain_idcard, dc.service_team_personnum, dc.service_team_speciality,
-            dc.construct_job_scope, dc.credential, dc.register_capital, dc.contact_person, dc.contact_phone, dc.approve_date2, dc.credit_level, dc.group_specialty, fsl.fstate badnessState
+            dc.construct_job_scope, dc.credential, dc.register_capital, dc.contact_person, dc.contact_phone, dc.approve_date2, dc.credit_level, dc.group_specialty, fsl.fstate badnessState,dc.resource_platform_classify
         from d_customer dc
         left join f_supplier_limited fsl on (fsl.flaowufbid = dc.customer_id
                 or fsl.fzhuanyefbid = dc.customer_id or fsl.ffgid = dc.customer_id or fsl.fzlid = dc.customer_id)

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DSgyjMapper.xml

+<?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.dsk.cscec.mapper.DsgyjMapper">
+
+    <select id="getSgyMsg" resultType="com.dsk.cscec.domain.vo.DSgyjVo">
+        select a.* from d_sgyj a LEFT JOIN  d_customer b  on a.fmasterid = b.customer_id
+
+        where b.cusomer_name = #{customerName}
+
+    </select>
+
+
+</mapper>