From 21b0e822c269ee4a0983b68f33789cb7c2649465 Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Wed, 6 Aug 2025 08:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoscoAnnualreviewTaskSupplierMapper.xml     | 16 +++++++++-------
 .../mapper/CoscoEvaluateTaskSupplierMapper.xml  | 16 +++++++++-------
 .../CoscoSupplierQualificationsMapper.xml       | 17 ++++++++++-------
 .../base/dao/mapper/CoscoSupplierexitMapper.xml | 15 +++++++++------
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
index ca6636b..518366a 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml
@@ -209,22 +209,24 @@
     </update>
 
     <select id="getSupplierAnnualReviewStatisticsList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo"
-            resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo">
+            resultMap="annualReviewResultMap">
         select
 
         csb.name supplierName,
+        csb.id as supplierId,
         case when csb.supplier_type = 'ovs' then '境外'
         when csb.supplier_type = 'ovs' then '境内'
         else '境内' end as area ,
-        csb.id,
-        '准入单位' as accessUnit,
-        '准入部门' as accessDept,
+        cats.id,
+        '天津中远海运集装箱运输有限公司' as accessUnit,
+
         case when cats.review_result = 1 then '合格'
         else '不合格' end as annualStatisticsResult,
-        (select GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' )
+        (select GROUP_CONCAT( DISTINCT  casc.category_name SEPARATOR ', ' )
         from cosco_access_supplier_category casc
-        where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryIds,
-        cat.annualreview_year
+        where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
+        cat.annualreview_year,
+        '天津中远海运集装箱运输有限公司' as accessDept
         from
         cosco_annualreview_task_supplier cats
         join cosco_supplier_base csb on cats.supplier_id=csb.id
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
index 98b8617..07ec59d 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
@@ -341,21 +341,23 @@
 
 
     <select id="getSupplierEvaluateStatisticsList"
-            resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStatisticsVo"
+            resultMap="supplierEvaluationResultMap"
             parameterType="map">
         select
         csb.name supplierName,
         case when csb.supplier_type = 'ovs' then '境外'
         when csb.supplier_type = 'ovs' then '境内'
         else '境内' end as area ,
-        cets.id,
-        (select GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' )
+        csb.id,
+        (select GROUP_CONCAT( DISTINCT casc.category_name SEPARATOR ', ' )
         from cosco_access_supplier_category casc
-        where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryIds,
-        '准入单位' as accessUnit,
-        '准入部门' as accessDept,
+        where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
+        '天津中远海运集装箱运输有限公司' as accessUnit,
+
+        cet.evaluate_year,
         cets.review_result evaluateResult,
-        cet.evaluate_year evaluateYear
+        '天津中远海运集装箱运输有限公司' as accessDept
+
         from
         cosco_evaluate_task_supplier cets
         join cosco_supplier_base csb on cets.supplier_id=csb.id
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 f161e75..3887647 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
@@ -219,11 +219,15 @@
         </foreach>
     </update>
 
-    <select id="getSupplierQualificationExpireList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo" resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo">
+    <select id="getSupplierQualificationExpireList"
+            parameterType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierQualificationExpireVo"
+            resultMap="supplierQualificationsResultMap">
         SELECT
+        csq.name as qualificationsName,
         csq.authority,
         csq.term_of_validity,
         csb.NAME supplierName,
+        csb.id as supplierId,
         CASE
 
         WHEN csb.supplier_type = 'ovs' THEN
@@ -231,19 +235,18 @@
         WHEN csb.supplier_type = 'ovs' THEN
         '境内' ELSE '境内'
         END AS area,
-        csb.id,
-        '准入单位' AS accessUnit,
-        '准入部门' AS accessDept,
+        csq.id,
         (
         SELECT
-        GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
+        GROUP_CONCAT( DISTINCT casc.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 category,
+        '天津中远海运集装箱运输有限公司' AS accessUnit,
+        '天津中远海运集装箱运输有限公司' AS accessDept
         FROM
         cosco_supplier_qualifications csq
         JOIN cosco_supplier_base csb ON csq.supplier_id = csb.id
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 1de0c97..84ac783 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
@@ -213,19 +213,22 @@
     </update>
 
     <select id="getSupplierExitStatisticsList"
-            resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo"
+            resultMap="supplierExitResultMap"
             parameterType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierExitStatisticsVo">
         select
         csb.name supplierName,
+        csb.id as supplierId,
         case when csb.supplier_type = 'ovs' then '境外'
         when csb.supplier_type = 'ovs' then '境内'
         else '境内' end as area ,
-        csb.id,
-        '退出单位' as accessUnit,
-        '退出部门' as accessDept,
+        cse.id,
+        '天津中远海运集装箱运输有限公司' as accessUnit,
+        '天津中远海运集装箱运输有限公司' as accessDept,
         cse.create_by as applyUser,
-        cse.update_time as applyTime,
-        (select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
+        (select GROUP_CONCAT( DISTINCT cssc.category_name SEPARATOR ', ' )
+        from cosco_supplierexit_supplier_category cssc
+        where   cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as category,
+        cse.update_time as applyTime
         from cosco_supplierexit_supplier_category cssc
         join cosco_category cc
         ON cc.id = cssc.category_id