From e5af0b7c27d3788adff93a5e502e321ae8b58188 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Mon, 30 Jun 2025 17:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoscoAnnualreviewTaskSupplierMapper.java  |   7 +
 .../CoscoAnnualreviewTaskSupplierMapper.xml   |  38 +++++
 .../dao/mapper/CoscoBlacklistMapper.xml       |   1 +
 .../supplier/coscoBlack/vo/BlackListVo.java   |   5 +
 .../dao/CoscoEvaluateTaskSupplierMapper.java  |   2 +
 .../CoscoEvaluateTaskSupplierMapper.xml       |  40 +++++-
 .../CoscoSupplierQualificationsMapper.java    |   6 +
 .../dao/mapper/CoscoSupplierexitMapper.java   |   7 +
 .../controller/DataStatisticeController.java  | 132 +++++++++++++++++-
 .../service/DataStatisticeService.java        |  29 ++++
 .../impl/DataStatisticeServiceImpl.java       |  35 +++++
 .../vo/SupplierAnnualReviewStatisticsVo.java  |  17 ++-
 .../vo/SupplierEvaluateStatisticsVo.java      |  17 ++-
 .../vo/SupplierExitStatisticsVo.java          |   8 ++
 .../vo/SupplierQualificationExpireVo.java     |   8 ++
 .../CoscoSupplierQualificationsMapper.xml     |  39 ++++++
 .../dao/mapper/CoscoSupplierexitMapper.xml    |  26 ++++
 17 files changed, 404 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java
index 9456245..2d4d1ce 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskSupplierMapper.java
@@ -91,4 +91,11 @@ public interface CoscoAnnualreviewTaskSupplierMapper {
      * @return
      */
     IPage<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatistics(IPage<SupplierAnnualReviewStatisticsVo> p, SupplierAnnualReviewStatisticsVo vo);
+
+    /**
+     * 导出年审列表
+     * @param vo
+     * @return
+     */
+    List<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo);
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
index 1d2db27..33c884c 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
@@ -184,6 +184,44 @@
         set del_flag = 'deleted'
         where annualreview_task_id = #{taskId}
     </update>
+
+    <select id="getSupplierAnnualReviewStatisticsList" parameterType="map"
+            resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo">
+        select
+
+        csb.name supplierName,
+        case when csb.supplier_type = 'ovs' then '境外'
+        when csb.supplier_type = 'ovs' then '境内'
+        else '境内' end as area ,
+        csb.id,
+        '准入单位' as accessUnit,
+        '准入部门' as accessDept,
+        case when cats.review_result = 1 then '合格'
+        else '不合格' end as annualStatisticsResult,
+        (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
+        from cosco_access_supplier_category casc
+        join cosco_category cc
+        ON cc.id = casc.category_id
+        where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
+        cat.annualreview_year
+        from
+        cosco_annualreview_task_supplier cats
+        join cosco_supplier_base csb on cats.supplier_id=csb.id
+        join cosco_annualreview_task cat on cat.id = cats.annualreview_task_id
+        <where>
+            cats.del_flag = 'normal'
+            <if test="vo.supplierName!=null and vo.supplierName!=''">
+                and csb.name like concat('%',#{vo.supplierName},'%')
+            </if>
+            <if test="vo.annualreviewYear!=null and vo.annualreviewYear!=''">
+                and cat.annualreview_year = #{vo.annualreviewYear}
+            </if>
+            and review_result is not null
+        </where>
+
+        order by cats.create_time desc
+    </select>
+
     <select id="getSupplierAnnualReviewStatistics" parameterType="map"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo">
         select
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
index 9c8248d..ee33cb7 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml
@@ -214,6 +214,7 @@
                '发起单位'            as unitName,
                cb.create_time        as createTime,
                cb.approve_status     as approveStatus,
+               cb.restore_approve_status as restoreApproveStatus,
                case
                    when cb.approve_status is null then '未开始'
                    when cb.approve_status = 0 then '进行中'
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java
index 8e5b031..402fc55 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/vo/BlackListVo.java
@@ -40,6 +40,11 @@ public class BlackListVo implements Serializable {
      */
     private String approveStatusName;
 
+    /**
+     * 恢复状态
+     */
+    private Integer restoreApproveStatus;
+
     /**
      * 主题信息（包含供应商名称和名单类型）
      */
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java
index 6fdd9e9..852e6b3 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskSupplierMapper.java
@@ -106,4 +106,6 @@ public interface CoscoEvaluateTaskSupplierMapper {
      * @return
      */
     List<CoscoEvaluateTaskSupplier> exportList(CoscoEvaluateTaskSupplier taskListVo);
+
+    List<SupplierEvaluateStatisticsVo> getSupplierEvaluateStatisticsList(SupplierEvaluateStatisticsVo vo);
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
index 06d4d9b..bccc0fc 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
@@ -127,7 +127,7 @@
                 and csb.name like concat('%',#{vo.supplierName},'%')
             </if>
             <if test="vo.levelName!=null and vo.levelName!=''">
-                and csb.level_name = #{levelName}
+                and cets.level_name = #{vo.levelName}
             </if>
         </where>
     </select>
@@ -318,6 +318,44 @@
         where evaluate_task_id = #{taskId}
     </update>
 
+
+    <select id="getSupplierEvaluateStatisticsList"
+            resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStatisticsVo"
+            parameterType="map">
+        select
+        csb.name supplierName,
+        case when csb.supplier_type = 'ovs' then '境外'
+        when csb.supplier_type = 'ovs' then '境内'
+        else '境内' end as area ,
+        csb.id,
+        (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
+        from cosco_access_supplier_category casc
+        join cosco_category cc
+        ON cc.id = casc.category_id
+        where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
+        '准入单位' as accessUnit,
+        '准入部门' as accessDept,
+        cets.review_result evaluateResult,
+        cet.evaluate_year evaluateYear
+        from
+        cosco_evaluate_task_supplier cets
+        join cosco_supplier_base csb on cets.supplier_id=csb.id
+        join cosco_evaluate_task cet on cet.id = cets.evaluate_task_id
+        <where>
+            cets.del_flag = 'normal'
+            and cets.review_result is not null
+            <if test="vo.supplierName!=null and vo.supplierName!=''">
+                and csb.name like concat('%',#{vo.supplierName},'%')
+            </if>
+            <if test="vo.evaluateYear!=null and vo.evaluateYear!=''">
+                and cet.evaluate_year = #{vo.evaluateYear}
+            </if>
+            <if test="vo.evaluateResult!=null and vo.evaluateResult!=''">
+                and cets.review_result = #{vo.evaluateResult}
+            </if>
+        </where>
+        order by cets.create_time desc
+    </select>
     <select id="getSupplierEvaluateStatistics"
             resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStatisticsVo"
             parameterType="map">
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java
index 6d8b0f3..5f81713 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierQualificationsMapper.java
@@ -72,4 +72,10 @@ public interface CoscoSupplierQualificationsMapper {
      * @return
      */
     IPage<SupplierQualificationExpireVo> getSupplierExitStatistics(IPage<SupplierQualificationExpireVo> p,@Param("vo") SupplierQualificationExpireVo vo);
+    /**
+     * 资质过期提醒
+     * @param vo
+     * @return
+     */
+    List<SupplierQualificationExpireVo> getSupplierQualificationExpireList(SupplierQualificationExpireVo vo);
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java
index 46f804e..d6c815d 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoSupplierexitMapper.java
@@ -73,4 +73,11 @@ public interface CoscoSupplierexitMapper {
      * @return
      */
     IPage<SupplierExitStatisticsVo> getSupplierExitStatistics(IPage<SupplierExitStatisticsVo> p, @Param("vo") SupplierExitStatisticsVo vo);
+
+    /**
+     * 查询退出数据
+     * @param vo
+     * @return
+     */
+    List<SupplierExitStatisticsVo> getSupplierExitStatisticsList(SupplierExitStatisticsVo vo);
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java
index c9eb451..d48cc89 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/controller/DataStatisticeController.java
@@ -1,7 +1,9 @@
 package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.controller;
 
+import com.alibaba.excel.EasyExcelFactory;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo;
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.service.DataStatisticeService;
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo;
@@ -9,10 +11,14 @@ import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStat
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo;
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 数据统计查询
@@ -32,6 +38,36 @@ public class DataStatisticeController {
 
         return BaseResponse.success(dataStatisticeService.getSupplierEvaluateStatistics(vo));
     }
+
+    /**
+     * 导出供应商评价情况统计
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/exportSupplierEvaluateStatistics")
+    public void export(HttpServletResponse response, SupplierEvaluateStatisticsVo vo) {
+        try {
+            List<SupplierEvaluateStatisticsVo> list = dataStatisticeService.getSupplierEvaluateStatisticsList(vo);
+            String fileName = URLEncoder.encode("供应评价.xlsx", "UTF-8");
+            // 动态设置导出字段（忽略未标注字段）
+            Set<String> includeFields = new HashSet<>(Arrays.asList(
+                    "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名
+            ));
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setCharacterEncoding("utf-8");
+            EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class)
+                    .includeColumnFieldNames(includeFields)
+                    .sheet("供应评价")
+                    .doWrite(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
     /**
      * 供应商年审情况统计
      */
@@ -40,6 +76,37 @@ public class DataStatisticeController {
 
         return BaseResponse.success(dataStatisticeService.getSupplierAnnualReviewStatistics(vo));
     }
+
+    /**
+     * 导出供应商年审列表
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/exportSupplierAnnualReviewStatistics")
+    public void exportSupplierAnnualReviewStatistics(HttpServletResponse response, SupplierAnnualReviewStatisticsVo vo) {
+        try {
+            List<SupplierAnnualReviewStatisticsVo> list = dataStatisticeService.getSupplierAnnualReviewStatisticsList(vo);
+            String fileName = URLEncoder.encode("供应年审.xlsx", "UTF-8");
+            // 动态设置导出字段（忽略未标注字段）
+            Set<String> includeFields = new HashSet<>(Arrays.asList(
+                    "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名
+            ));
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setCharacterEncoding("utf-8");
+            EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class)
+                    .includeColumnFieldNames(includeFields)
+                    .sheet("供应年审")
+                    .doWrite(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+
     /**
      * 退出情况统计
      */
@@ -48,6 +115,35 @@ public class DataStatisticeController {
 
         return BaseResponse.success(dataStatisticeService.getSupplierExitStatistics(vo));
     }
+
+    /**
+     * 导出供应商退出列表
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/exportSupplierExitStatistics")
+    public void exportSupplierExitStatistics(HttpServletResponse response, SupplierExitStatisticsVo vo) {
+        try {
+            List<SupplierExitStatisticsVo> list = dataStatisticeService.getSupplierExitStatisticsList(vo);
+            String fileName = URLEncoder.encode("供应商退出信息.xlsx", "UTF-8");
+            // 动态设置导出字段（忽略未标注字段）
+            Set<String> includeFields = new HashSet<>(Arrays.asList(
+                    "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名
+            ));
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setCharacterEncoding("utf-8");
+            EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class)
+                    .includeColumnFieldNames(includeFields)
+                    .sheet("供应商退出信息")
+                    .doWrite(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
     /**
      * 资质过期提醒
      */
@@ -57,4 +153,32 @@ public class DataStatisticeController {
         return BaseResponse.success(dataStatisticeService.getSupplierQualificationExpire(vo));
     }
 
+    /**
+     * 导出供应商资质列表
+     *
+     * @param
+     * @return
+     */
+    @GetMapping("/exportSupplierQualificationExpire")
+    public void exportSupplierQualificationExpire(HttpServletResponse response, SupplierQualificationExpireVo vo) {
+        try {
+            List<SupplierQualificationExpireVo> list = dataStatisticeService.getSupplierQualificationExpireList(vo);
+            String fileName = URLEncoder.encode("供应商资质.xlsx", "UTF-8");
+            // 动态设置导出字段（忽略未标注字段）
+            Set<String> includeFields = new HashSet<>(Arrays.asList(
+                    "supplierName", "categoryName", "reviewScore", "reviewResult" // 指定要导出的字段名
+            ));
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setCharacterEncoding("utf-8");
+            EasyExcelFactory.write(response.getOutputStream(), CoscoEvaluateTaskSupplier.class)
+                    .includeColumnFieldNames(includeFields)
+                    .sheet("供应商资质")
+                    .doWrite(list);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/DataStatisticeService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/DataStatisticeService.java
index 48fb64e..83e3fc2 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/DataStatisticeService.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/DataStatisticeService.java
@@ -6,6 +6,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStat
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo;
 import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo;
 
+import java.util.List;
+
 public interface DataStatisticeService {
     /**
      * 供应商评价统计
@@ -34,4 +36,31 @@ public interface DataStatisticeService {
      * @return
      */
     IPage<SupplierQualificationExpireVo> getSupplierQualificationExpire(SupplierQualificationExpireVo vo);
+
+    /**
+     * 查询导出评价数据
+     * @param vo
+     * @return
+     */
+    List<SupplierEvaluateStatisticsVo> getSupplierEvaluateStatisticsList(SupplierEvaluateStatisticsVo vo);
+    /**
+     * 查询导出年审数据
+     * @param vo
+     * @return
+     */
+    List<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo);
+
+    /**
+     * 供应商退出统计查询
+     * @param vo
+     * @return
+     */
+    List<SupplierExitStatisticsVo> getSupplierExitStatisticsList(SupplierExitStatisticsVo vo);
+
+    /**
+     * 供应商资质
+     * @param vo
+     * @return
+     */
+    List<SupplierQualificationExpireVo> getSupplierQualificationExpireList(SupplierQualificationExpireVo vo);
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java
index 5a09885..2aea34e 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java
@@ -15,6 +15,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificatio
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class DataStatisticeServiceImpl implements DataStatisticeService {
 
@@ -42,6 +44,16 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
         return coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatistics(p, vo);
     }
 
+    /**
+     * 查询导出年审数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public List<SupplierAnnualReviewStatisticsVo> getSupplierAnnualReviewStatisticsList(SupplierAnnualReviewStatisticsVo vo){
+        return coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatisticsList(vo);
+    }
+
     @Override
     public IPage<SupplierExitStatisticsVo> getSupplierExitStatistics(SupplierExitStatisticsVo vo) {
         IPage<SupplierExitStatisticsVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
@@ -49,10 +61,33 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
         return coscoSupplierexitMapper.getSupplierExitStatistics(p, vo);
     }
 
+    /**
+     * 供应商退出统计查询
+     * @param vo
+     * @return
+     */
+    public List<SupplierExitStatisticsVo> getSupplierExitStatisticsList(SupplierExitStatisticsVo vo){
+        return coscoSupplierexitMapper.getSupplierExitStatisticsList(vo);
+    }
+
     @Override
     public IPage<SupplierQualificationExpireVo> getSupplierQualificationExpire(SupplierQualificationExpireVo vo) {
         IPage<SupplierQualificationExpireVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
                 vo.getBasePageRequest().getPageSize());
         return coscoSupplierQualificationsMapper.getSupplierExitStatistics(p, vo);
     }
+
+    /**
+     * 供应商资质
+     * @param vo
+     * @return
+     */
+    public List<SupplierQualificationExpireVo> getSupplierQualificationExpireList(SupplierQualificationExpireVo vo){
+        return coscoSupplierQualificationsMapper.getSupplierQualificationExpireList( vo);
+    }
+
+    @Override
+    public List<SupplierEvaluateStatisticsVo> getSupplierEvaluateStatisticsList(SupplierEvaluateStatisticsVo vo) {
+        return coscoEvaluateTaskMapper.getSupplierEvaluateStatisticsList(vo);
+    }
 }
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java
index d21f97e..e77565d 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java
@@ -1,5 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,33 +15,41 @@ public class SupplierAnnualReviewStatisticsVo {
      * id
      */
     private String id;
+    /**
+     * 供应商名称
+     */
+    @ExcelProperty("供应商名称")
+    private String supplierName;
     /**
      * 境内/境外
      */
+    @ExcelProperty("境内/境外")
     private String area;
     /**
      * 品类
      */
+    @ExcelProperty("品类")
     private String categoryName;
-    /**
-     * 供应商名称
-     */
-    private String supplierName;
+
     /**
      * 准入单位
      */
+    @ExcelProperty("准入单位")
     private String accessUnit;
     /**
      * 准入部门
      */
+    @ExcelProperty("准入部门")
     private String accessDept;
     /**
      * 评价年度
      */
+    @ExcelProperty("评价年度")
     private String annualreviewYear;
     /**
      * 评价结果
      */
+    @ExcelProperty("评价结果")
     private String annualStatisticsResult;
 
     @ApiModelProperty(value = "分页对象信息")
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java
index 7da91d9..234e3a6 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java
@@ -1,5 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,33 +11,41 @@ public class SupplierEvaluateStatisticsVo {
      * id
      */
     private String id;
+    /**
+     * 供应商名称
+     */
+    @ExcelProperty("供应商名称")
+    private String supplierName;
     /**
      * 境内/境外
      */
+    @ExcelProperty("境内/境外")
     private String area;
     /**
      * 品类
      */
+    @ExcelProperty("品类")
     private String categoryName;
-    /**
-     * 供应商名称
-     */
-    private String supplierName;
+
     /**
      * 准入单位
       */
+    @ExcelProperty("准入单位")
     private String accessUnit;
     /**
      * 准入部门
      */
+    @ExcelProperty("准入部门")
     private String accessDept;
     /**
      * 评价年度
      */
+    @ExcelProperty("评价年度")
     private String evaluateYear;
     /**
      * 评价结果
      */
+    @ExcelProperty("评价结果")
     private String evaluateResult;
 
     @ApiModelProperty(value = "分页对象信息")
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java
index be77df5..df75f1b 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java
@@ -1,5 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,30 +10,37 @@ public class SupplierExitStatisticsVo {
     /**
      * 境内/境外
      */
+    @ExcelProperty("境内/境外")
     private String area;
     /**
      * 退出品类
      */
+    @ExcelProperty("退出品类")
     private String categoryName;
     /**
      * 供应商名称
      */
+    @ExcelProperty("供应商名称")
     private String supplierName;
     /**
      * 退出单位
      */
+    @ExcelProperty("退出单位")
     private String accessUnit;
     /**
      * 退出部门
      */
+    @ExcelProperty("退出部门")
     private String accessDept;
     /**
      * 退出申请人
      */
+    @ExcelProperty("退出申请人")
     private String applyUser;
     /**
      * 退出时间
      */
+    @ExcelProperty("退出时间")
     private String applyTime;
 
     @ApiModelProperty(value = "分页对象信息")
diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java
index 8b323c2..0466b3f 100644
--- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java
+++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java
@@ -1,5 +1,6 @@
 package com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.chinaunicom.mall.ebtp.common.base.entity.BasePageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,21 +14,25 @@ public class SupplierQualificationExpireVo {
     /**
      * 发证机构
      */
+    @ExcelProperty("发证机构")
     private String authority;
 
     /**
      * 有效期截止日
      */
+    @ExcelProperty("有效期截止日")
     private Date termOfValidity;
 
     /**
      * 供应商名称
      */
+    @ExcelProperty("供应商名称")
     private String supplierName;
 
     /**
      * 地区（境内/境外）
      */
+    @ExcelProperty("地区（境内/境外）")
     private String area;
 
     /**
@@ -38,16 +43,19 @@ public class SupplierQualificationExpireVo {
     /**
      * 准入单位（固定值）
      */
+    @ExcelProperty("准入单位")
     private String accessUnit;
 
     /**
      * 准入部门（固定值）
      */
+    @ExcelProperty("准入部门")
     private String accessDept;
 
     /**
      * 分类名称（多个分类逗号分隔）
      */
+    @ExcelProperty("分类名称")
     private String categoryName;
 
     @ApiModelProperty(value = "分页对象信息")
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml
index 4ba8871..b7f3d97 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml
@@ -221,6 +221,45 @@
             #{id}
         </foreach>
     </update>
+
+    <select id="getSupplierQualificationExpireList" parameterType="map" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo">
+        SELECT
+        csq.authority,
+        csq.term_of_validity,
+        csb.NAME supplierName,
+        CASE
+
+        WHEN csb.supplier_type = 'ovs' THEN
+        '境外'
+        WHEN csb.supplier_type = 'ovs' THEN
+        '境内' ELSE '境内'
+        END AS area,
+        csb.id,
+        '准入单位' AS accessUnit,
+        '准入部门' AS accessDept,
+        (
+        SELECT
+        GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
+        FROM
+        cosco_access_supplier_category casc
+        JOIN cosco_category cc ON cc.id = casc.category_id
+        WHERE
+        casc.del_flag = 'normal'
+        AND casc.supplier_id = csb.id
+        ) AS categoryName
+        FROM
+        cosco_supplier_qualifications csq
+        JOIN cosco_supplier_base csb ON csq.supplier_id = csb.id
+        WHERE
+        csq.del_flag = 'normal'
+        AND ( csq.term_of_validity &lt; CURDATE() OR csq.term_of_validity
+        BETWEEN CURDATE() AND DATE_ADD( CURDATE(), INTERVAL 30 DAY ) )
+        <if test="vo.supplierName!=null and vo.supplierName!=''">
+            and csb.name like concat('%',#{vo.supplierName},'%')
+        </if>
+        ORDER BY
+        csq.term_of_validity ASC
+    </select>
     <select id="getSupplierExitStatistics" parameterType="map" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo">
         SELECT
         csq.authority,
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml
index 10327f1..f474e7a 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml
@@ -190,6 +190,32 @@
             #{id}
         </foreach>
     </update>
+
+    <select id="getSupplierExitStatisticsList" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo" parameterType="map">
+        select
+        csb.name supplierName,
+        case when csb.supplier_type = 'ovs' then '境外'
+        when csb.supplier_type = 'ovs' then '境内'
+        else '境内' end as area ,
+        csb.id,
+        '退出单位' as accessUnit,
+        '退出部门' as accessDept,
+        cse.create_by as applyUser,
+        cse.update_time as applyTime,
+        (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
+        from cosco_supplierexit_supplier_category cssc
+        join cosco_category cc
+        ON cc.id = cssc.category_id
+        where   cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as categoryName
+        from cosco_supplierexit  cse
+        join cosco_supplierexit_supplier css
+        on cse.id= css.supplierexit_id
+        join cosco_supplier_base csb on csb.id=css.supplier_id
+        where cse.approve_status=1
+        <if test="vo.supplierName!=null and vo.supplierName!=''">
+            and csb.name like concat('%',#{vo.supplierName},'%')
+        </if>
+    </select>
     <select id="getSupplierExitStatistics" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo" parameterType="map">
         select
             csb.name supplierName,