u

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

@@ -56,7 +56,7 @@ public class DCustomerController extends BaseController {
     public void export(@RequestBody DCustomerSearchBo bo, HttpServletResponse response) {
         List<DCustomerListVo> list = baseService.exportList(bo);
         ExcelUtils<DCustomerListVo> util = new ExcelUtils<>(DCustomerListVo.class);
-        util.exportExcel(response, list, "集团中标","", true);
+        util.exportExcel(response, list, "sheet1","大数据经营管理支撑服务平台供应商导出", true);
     }
 
   

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

 package com.dsk.cscec.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.dsk.common.annotation.Excel;
 import lombok.Data;
 
@@ -17,6 +15,9 @@ public class DCustomerListVo implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
+
+    @Excel(name = "序号",  width = 6)
+    private Integer num;
     /**
      * jsk企业id
      */
@@ -33,129 +34,138 @@ public class DCustomerListVo implements Serializable {
      * 税号
      */
     private String taxNumber;
-    /**
-     * 供应商编号
-     */
-    @Excel(name = "供应商编号",  width = 5)
-    private String customerCode;
     /**
      * 供应商名称
      */
-    @Excel(name = "供应商名称",  width = 10)
+    @Excel(name = "供应商名称",  width = 30)
     private String customerName;
+    /**
+     * 供应商编号
+     */
+    @Excel(name = "供应商编号",  width = 15)
+    private String customerCode;
     /**
      * 推荐公司
      */
-    @Excel(name = "推荐公司",  width = 10)
+    @Excel(name = "推荐单位",  width = 30)
     private String recommendOrg;
     /**
      * 注册地区域
      */
-    @Excel(name = "注册地区域",  width = 5)
+    @Excel(name = "公司注册区域",  width = 10)
     private String registerRegion;
     /**
      * 省份
      */
-    @Excel(name = "省份",  width = 5)
+    @Excel(name = "公司注册省",  width = 10)
     private String registerProvince;
     /**
      * 城市
      */
-    @Excel(name = "城市",  width = 5)
+    @Excel(name = "公司注册市",  width = 10)
     private String registerCity;
-    /**
-     * 注册资金
-     */
-    @Excel(name = "注册资金",  width = 5)
-    private Double registerCapital;
     /**
      * 供应商类别
      */
-    @Excel(name = "供应商类别",  width = 5)
+    @Excel(name = "供应商类别",  width = 10)
     private String customerClass;
     /**
      * 集团专业类别
      */
-    @Excel(name = "专业类别",  width = 5)
+    @Excel(name = "专业类别",  width = 20)
     private String groupSpecialty;
     /**
      * 纳税人身份
      */
-    @Excel(name = "纳税人身份",  width = 5)
+    @Excel(name = "纳税人身份",  width = 10)
     private String paytaxType;
     /**
      * 纳税人税率
      */
-    @Excel(name = "纳税人税率",  width = 5)
+    @Excel(name = "纳税人税率",  width = 10)
     private String taxRate;
     /**
      * 供应商状态
      */
-    @Excel(name = "供应商状态",  width = 5)
+    @Excel(name = "状态",  width = 10)
     private String customerState;
     /**
-     * 队长名称
+     * 限用/禁用状态
      */
-    @Excel(name = "劳务队长",  width = 5)
-    private String leaderName;
+    @Excel(name = "限用/禁用状态",  width = 10)
+    private String badnessState;
     /**
-     * 劳务队长身份证号
+     * 队长名称
      */
-    @Excel(name = "劳务队长身份证号",  width = 5)
-    private String laborCaptainIdcard;
+    @Excel(name = "劳务队长",  width = 10)
+    private String leaderName;
     /**
      * 劳务队长联系电话
      */
-    @Excel(name = "劳务队长联系电话",  width = 5)
+    @Excel(name = "队长联系电话",  width = 10)
     private String laborCaptainPhone;
+    /**
+     * 劳务队长身份证号
+     */
+    @Excel(name = "队长身份证号",  width = 10)
+    private String laborCaptainIdcard;
     /**
      * 队伍规模人数
      */
-    @Excel(name = "队伍规模人数",  width = 5)
+    @Excel(name = "队伍规模",  width = 10)
     private Double serviceTeamPersonnum;
     /**
      * 专业特长
      */
-    @Excel(name = "专业特长",  width = 5)
+    @Excel(name = "专业特长",  width = 10)
     private String serviceTeamSpeciality;
     /**
      * 施工承包范围
      */
-    @Excel(name = "施工承包范围",  width = 5)
+    @Excel(name = "施工承包范围",  width = 25)
     private String constructJobScope;
     /**
      * 资质等级
      */
-    @Excel(name = "资质等级",  width = 5)
+    @Excel(name = "资质等级",  width = 10)
     private String credential;
+    /**
+     * 注册资金
+     */
+    @Excel(name = "注册资金（万元）",  width = 10)
+    private Double registerCapital;
     /**
      * 联系人
      */
-    @Excel(name = "联系人",  width = 5)
+    @Excel(name = "公司联系人",  width = 10)
     private String contactPerson;
     /**
      * 电话
      */
-    @Excel(name = "电话",  width = 5)
+    @Excel(name = "联系人电话",  width = 10)
     private String contactPhone;
+
     /**
      * 准入时间
      */
-    @Excel(name = "准入时间",  width = 5 , dateFormat = "yyyy-MM-dd")
+    @Excel(name = "准入时间",  width = 10 , dateFormat = "yyyy-MM-dd")
     private Date approveDate2;
-    /**
-     * 考评等级
-     */
-    @Excel(name = "考评等级",  width = 5)
-    private String creditLevel;
     /**
      * 企业合作数量
      */
+    @Excel(name = "公司合作数量",  width = 10 )
     private Integer enterpriseCooperationCount;
     /**
      * 项目合作数量
      */
+    @Excel(name = "合作项目数量",  width = 10 )
     private Integer projectCooperationCount;
+    /**
+     * 考评等级
+     */
+    @Excel(name = "分包商等级",  width = 10)
+    private String creditLevel;
+
 
 
 }

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

@@ -68,9 +68,16 @@ public class DCustomerServiceImpl extends ServiceImpl<DCustomerMapper, DCustomer
     public List<DCustomerListVo> exportList(DCustomerSearchBo bo) {
         dealWithCustomerClass(bo);
         PageQuery query = new PageQuery();
-        query.setPageNum(1);
-        query.setPageSize(1000);
-        return baseMapper.allSearchList(query.build(), bo).getRecords();
+        List<DCustomerListVo> records = baseMapper.allSearchList(query.build(), bo).getRecords();
+        if(CollectionUtils.isNotEmpty(records)){
+            records.parallelStream().forEach(item->{
+                //企业合作数量
+                item.setEnterpriseCooperationCount(subcontractMapper.selectEnterpriseCountByCustomerId(item.getCustomerId()));
+                //项目合作数量
+                item.setProjectCooperationCount(subcontractMapper.selectProjectCountByCustomerId(item.getCustomerId()));
+            });
+        }
+        return records;
     }
 
     private void dealWithCustomerClass(DCustomerSearchBo bo) {

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

@@ -6,10 +6,11 @@
 
     <select id="allSearchList" resultType="com.dsk.cscec.domain.vo.DCustomerListVo">
         select
+            @row_number:=@row_number + 1 AS num,
             customer_key, customer_id, customer_code, customer_name, recommend_org, register_region, register_province, register_city, customer_class, primary_business,
             paytax_type, tax_rate, customer_state, leader_name, labor_captain_phone, labor_captain_idcard, service_team_personnum, service_team_speciality,
             construct_job_scope, credential, register_capital, contact_person, contact_phone, approve_date2, credit_level, group_specialty
-        from d_customer
+        from d_customer , (SELECT @row_number:=0) AS t
         where recommend_org_id = 'F17305B4EA4444CBAB12892C7B99E475'
         <if test="bo.customerName != null and bo.customerName != '' "> and customer_name like concat('%',#{bo.customerName},'%')</if>
         <if test="bo.province != null and bo.province.size > 0 and (bo.city == null or bo.city.size == 0) ">