Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

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

@@ -5,6 +5,7 @@ import com.dsk.common.core.controller.BaseController;
 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.excel.ExcelUtils;
 import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.cscec.domain.bo.AddDCustomerLaborLeaderBo;
 import com.dsk.cscec.domain.bo.AdvisoryBodyBo;
@@ -47,6 +48,16 @@ public class CustomerInfoController extends BaseController {
         return iCustomerInfoService.queryPageList(bo, query);
     }
 
+    /**
+     * 导出供应商分类列表
+     */
+    @PostMapping("/exportCustomerList")
+    public void exportCustomerList(@RequestBody CustomerInfoBo bo, HttpServletResponse response) {
+        List<CustomerInfoVo> list = iCustomerInfoService.exportCustomerList(bo);
+        ExcelUtils<CustomerInfoVo> util = new ExcelUtils<>(CustomerInfoVo.class);
+        util.exportExcel(response, list, bo.getCustomerClass(),"大数据经营管理支撑服务平台供应商导出", true);
+    }
+
     /**
      * 内部合作-咨询机构合作记录
      */

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

 package com.dsk.cscec.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.dsk.common.annotation.Excel;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -13,10 +15,11 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class CustomerInfoVo {
+public class CustomerInfoVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    @Excel(name = "序号", width = 6)
+    private Integer num;
     /**
      * 客商主键
      */
@@ -28,125 +31,147 @@ public class CustomerInfoVo {
     /**
      * 供应商编号
      */
+    @Excel(name = "供应商编号", width = 15)
     private String customerCode;
     /**
      * 供应商名称
      */
+    @Excel(name = "供应商名称", width = 30)
     private String customerName;
     /**
-     * 供应商状态
+     * 二级市场企业编码
      */
-    private String customerState;
+    @Excel(name = "二级市场企业编码", width = 15)
+    private String secondaryCode;
     /**
-     * 推荐公司ID
+     * 统一社会信用代码/营业执照号码
      */
-    private String recommendOrgId;
+    @Excel(name = "统一社会信用代码/营业执照号码", width = 30)
+    private String unifySocialCode;
     /**
      * 推荐公司
      */
+    @Excel(name = "推荐单位", width = 30)
     private String recommendOrg;
     /**
      * 注册地区域
      */
+    @Excel(name = "公司注册区域", width = 10)
     private String registerRegion;
     /**
      * 省份
      */
+    @Excel(name = "公司注册省", width = 10)
     private String registerProvince;
     /**
      * 城市
      */
+    @Excel(name = "公司注册市", width = 10)
     private String registerCity;
-    /**
-     * 集团专业类别
-     */
-    private String groupSpecialty;
     /**
      * 法人代表
      */
+    @Excel(name = "法人代表", width = 10)
     private String representative;
-    /**
-     * 纳税人身份
-     */
-    private String paytaxType;
-    /**
-     * 纳税人税率
-     */
-    private String taxRate;
-    /**
-     * 施工承包范围
-     */
-    private String constructJobScope;
-    /**
-     * 资质等级
-     */
-    private String credential;
-    /**
-     * 注册资金
-     */
-    private Double registerCapital;
     /**
      * 联系人
      */
+    @Excel(name = "公司联系人", width = 10)
     private String contactPerson;
     /**
      * 联系人电话
      */
+    @Excel(name = "联系人电话", width = 10)
     private String contactPhone;
     /**
-     * 准入时间
-     */
-    private Date approveDate2;
-    /**
-     * 供应商类别
+     * 注册资金
      */
-    private String customerClass;
+    @Excel(name = "注册资金（万元）", cellType = Excel.ColumnType.NUMERIC, width = 10)
+    private Double registerCapital;
     /**
-     * 考评等级
+     * 纳税人身份
      */
-    private String creditLevel;
+    @Excel(name = "纳税人身份", width = 10)
+    private String paytaxType;
     /**
-     * 二级市场企业编码
+     * 纳税人税率
      */
-    private String secondaryCode;
+    @Excel(name = "纳税人税率", width = 10)
+    private String taxRate;
     /**
-     * 统一社会信用代码/营业执照号码
+     * 资质等级
      */
-    private String unifySocialCode;
+    @Excel(name = "资质等级", width = 10)
+    private String credential;
     /**
      * 队长名称
      */
+    @Excel(name = "劳务队长", width = 10)
     private String leaderName;
-    /**
-     * 劳务队长身份证号
-     */
-    private String laborCaptainIdcard;
     /**
      * 劳务队长联系电话
      */
+    @Excel(name = "队长联系电话", width = 10)
     private String laborCaptainPhone;
+    /**
+     * 劳务队长身份证号
+     */
+    @Excel(name = "队长身份证号", width = 10)
+    private String laborCaptainIdcard;
     /**
      * 队伍规模人数
      */
+    @Excel(name = "队伍规模", cellType = Excel.ColumnType.NUMERIC, width = 10)
     private Double serviceTeamPersonnum;
     /**
      * 专业特长
      */
+    @Excel(name = "专业特长", width = 10)
     private String serviceTeamSpeciality;
+    /**
+     * 准入时间
+     */
+    @Excel(name = "准入时间", width = 10, dateFormat = "yyyy-MM-dd")
+    private Date approveDate2;
     /**
      * 公司合作数量
      */
+    @Excel(name = "公司合作数量", width = 10)
     private Integer enterpriseCooperationCount;
     /**
      * 合作项目数量
      */
+    @Excel(name = "合作项目数量", width = 10)
     private Integer projectCooperationCount;
     /**
-     * jsk企业id
+     * 考评等级
      */
-    private Integer companyId;
+    @Excel(name = "分包商等级", width = 10)
+    private String creditLevel;
     /**
-     * 资源平台分类
+     * 供应商状态
+     */
+    private String customerState;
+    /**
+     * 推荐公司ID
+     */
+    private String recommendOrgId;
+    /**
+     * 集团专业类别
+     */
+    @Excel(name = "专业类别", width = 20)
+    private String groupSpecialty;
+    /**
+     * 施工承包范围
+     */
+    private String constructJobScope;
+    /**
+     * 供应商类别
      */
+    private String customerClass;
+    /**
+     * jsk企业id
+     */
+    private Integer companyId;
 
 }

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

@@ -32,6 +32,11 @@ public interface ICustomerInfoService extends IService<DCustomer> {
      */
     TableDataInfo<CustomerInfoVo> queryPageList(CustomerInfoBo bo, PageQuery query);
 
+    /**
+     * 导出供应商分类列表
+     */
+    List<CustomerInfoVo> exportCustomerList(CustomerInfoBo bo);
+
     /**
      * 供应商准入情况
      * @param bo

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

@@ -34,6 +34,7 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 组织维表(DCustomer)表服务实现类
@@ -62,8 +63,10 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
             bo.setServiceTeamLogo("Y");
         }
         Page<CustomerInfoVo> page = baseMapper.queryListByType(query.build(), bo);
+        AtomicInteger sortNum = new AtomicInteger(1);
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
-            page.getRecords().parallelStream().forEach(item -> {
+            page.getRecords().forEach(item->{
+                item.setNum(sortNum.getAndIncrement());
                 DCustomerListVo vo = subcontractMapper.selectStatisticByCustomerId(item.getCustomerId());
                 //企业合作数量
                 item.setEnterpriseCooperationCount(vo.getEnterpriseCooperationCount());
@@ -92,6 +95,14 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
         return TableDataInfo.build(page);
     }
 
+    /**
+     * 导出供应商分类列表
+     */
+    @Override
+    public List<CustomerInfoVo> exportCustomerList(CustomerInfoBo bo) {
+        return this.queryPageList(bo, new PageQuery()).getRows();
+    }
+
     @Override
     public CustomerApproveVo queryApproveByBo(CustomerInfoBo bo) {
         if (ObjectUtil.isNull(bo.getCustomerKey()) && StringUtil.isBlank(bo.getCustomerName()) && StringUtil.isBlank(bo.getUnifySocialCode())) {

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

@@ -73,6 +73,7 @@ public class LaborLeaderCustomerRiskServiceImpl extends ServiceImpl<LaborLeaderC
         wrapper
                 .like(StringUtils.isNotBlank(queryBo.getLeaderName()), "leader_name", queryBo.getLeaderName())
                 .like(StringUtils.isNotBlank(queryBo.getCustomerName()), "customer_name", queryBo.getCustomerName())
+                .eq(ObjectUtil.isNotNull(queryBo.getCustomerCid()),"customer_cid",queryBo.getCustomerCid())
                 .gt(ObjectUtil.isNotNull(queryBo.getStartDate()), "create_time", queryBo.getStartDate())
                 .lt(ObjectUtil.isNotNull(queryBo.getEndDate()), "create_time", queryBo.getEndDate())
                 .between(ObjectUtil.isNotNull(queryBo.getStartDate()) && ObjectUtil.isNotNull(queryBo.getEndDate()),
@@ -85,7 +86,6 @@ public class LaborLeaderCustomerRiskServiceImpl extends ServiceImpl<LaborLeaderC
             //关键字标红
             if (StringUtils.isNotBlank(queryBo.getLeaderName())) {
                 item.setLeaderName(StringUtils.markInRed(item.getLeaderName(), queryBo.getLeaderName()));
-
             }
             if (StringUtils.isNotBlank(queryBo.getCustomerName())) {
                 item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), queryBo.getCustomerName()));