修改映射问题

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierAnnualReviewStatisticsVo.java

@@ -35,12 +35,12 @@ public class SupplierAnnualReviewStatisticsVo {
      * 准入单位
      */
     @ExcelProperty("准入单位")
-    private String accessUnit;
+    private String accessUnit="天津中远海运集装箱运输有限公司";
     /**
      * 准入部门
      */
     @ExcelProperty("准入部门")
-    private String accessDept;
+    private String accessDept="天津中远海运集装箱运输有限公司";
     /**
      * 评价年度
      */

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java

@@ -31,17 +31,17 @@ public class SupplierEvaluateStatisticsVo {
      * 准入单位
       */
     @ExcelProperty("准入单位")
-    private String accessUnit;
+    private String accessUnit="天津中远海运集装箱运输有限公司";
     /**
      * 准入部门
      */
     @ExcelProperty("准入部门")
-    private String accessDept;
+    private String accessDept="天津中远海运集装箱运输有限公司";
     /**
      * 评价年度
      */
     @ExcelProperty("评价年度")
-    private String evaluateYear="2025";
+    private String evaluateYear;
     /**
      * 评价结果
      */

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml

@@ -243,8 +243,20 @@
         order by cats.create_time desc
     </select>
 
+    <resultMap id="annualReviewResultMap" type="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo">
+        <result property="supplierName" column="supplierName"/>
+        <result property="supplierId" column="supplierId"/>
+        <result property="area" column="area"/>
+        <result property="id" column="id"/>
+        <result property="accessUnit" column="accessUnit"/>
+        <result property="accessDept" column="accessDept"/>
+        <result property="annualStatisticsResult" column="annualStatisticsResult"/>
+        <result property="categoryName" column="categoryName"/>
+        <result property="annualreviewYear" column="annualreview_year"/>
+    </resultMap>
+
     <select id="getSupplierAnnualReviewStatistics" parameterType="map"
-            resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierAnnualReviewStatisticsVo">
+            resultMap="annualReviewResultMap">
         select
 
         csb.name supplierName,
@@ -254,13 +266,14 @@
         else '境内' end as area ,
         cats.id,
         '天津中远海运集装箱运输有限公司' as accessUnit,
-        '天津中远海运集装箱运输有限公司' as accessDept,
+
         case when cats.review_result = 1 then '合格'
         else '不合格' end as annualStatisticsResult,
         (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 categoryName,
-        cat.annualreview_year as annualreviewYear
+        cat.annualreview_year,
+        '天津中远海运集装箱运输有限公司' as accessDept
         from
         cosco_annualreview_task_supplier cats
         join cosco_supplier_base csb on cats.supplier_id=csb.id

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml

@@ -375,8 +375,19 @@
         </where>
         order by cets.create_time desc
     </select>
+    <resultMap id="supplierEvaluationResultMap" type="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStatisticsVo">
+        <result property="supplierName" column="supplierName"/>
+        <result property="area" column="area"/>
+        <result property="id" column="id"/>
+        <result property="categoryName" column="categoryName"/>
+        <result property="accessUnit" column="accessUnit"/>
+        <result property="accessDept" column="accessDept"/>
+        <result property="evaluateResult" column="evaluateResult"/>
+        <result property="evaluateYear" column="evaluate_year"/>
+    </resultMap>
+
     <select id="getSupplierEvaluateStatistics"
-            resultType="com.chinaunicom.zyhy.ebtp.supplier.dataStatistics.vo.SupplierEvaluateStatisticsVo"
+            resultMap="supplierEvaluationResultMap"
             parameterType="map">
         select
         csb.name supplierName,
@@ -388,9 +399,11 @@
         from cosco_access_supplier_category casc
         where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
         '天津中远海运集装箱运输有限公司' as accessUnit,
-        '天津中远海运集装箱运输有限公司' as accessDept,
+
+        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

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierQualificationsMapper.xml

@@ -287,8 +287,6 @@
         '境内' ELSE '境内'
         END AS area,
         csq.id,
-        '天津中远海运集装箱运输有限公司' AS accessUnit,
-        '天津中远海运集装箱运输有限公司' AS accessDept,
         (
         SELECT
         GROUP_CONCAT( DISTINCT casc.category_name SEPARATOR ', ' )
@@ -297,7 +295,10 @@
         WHERE
         casc.del_flag = 'normal'
         AND casc.supplier_id = csb.id
-        ) AS category
+        ) AS category,
+        '天津中远海运集装箱运输有限公司' AS accessUnit,
+        '天津中远海运集装箱运输有限公司' AS accessDept
+
         FROM
         cosco_supplier_qualifications csq
         JOIN cosco_supplier_base csb ON csq.supplier_id = csb.id

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierexitMapper.xml

@@ -262,10 +262,11 @@
             '天津中远海运集装箱运输有限公司' as accessUnit,
             '天津中远海运集装箱运输有限公司' as accessDept,
             cse.create_by as applyUser,
-            cse.update_time as applyTime,
         (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
+        where   cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as category,
+            cse.update_time as applyTime
+
         from cosco_supplierexit  cse
                  join cosco_supplierexit_supplier css
                       on cse.id= css.supplierexit_id