数据修改

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java

@@ -53,14 +53,6 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
 
         supplierEvaluateStatistics.getRecords().forEach(item -> {
 
-            if (item.getCategoryIds() != null && item.getCategoryIds().length() > 0) {
-                String[] split = item.getCategoryIds().split(",");
-                StringBuilder builder = new StringBuilder();
-                for (String s : split) {
-                    builder.append(coscoCategoryService.getCategoryNameById(s).getCategoryName());
-                }
-                item.setCategoryName(builder.toString());
-            }
         });
         return supplierEvaluateStatistics;
     }
@@ -71,14 +63,6 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
                 vo.getBasePageRequest().getPageSize());
         IPage<SupplierAnnualReviewStatisticsVo> supplierAnnualReviewStatistics = coscoAnnualreviewTaskMapper.getSupplierAnnualReviewStatistics(p, vo);
         supplierAnnualReviewStatistics.getRecords().forEach(item -> {
-            StringBuilder builder = new StringBuilder();
-            if (item.getCategoryIds() != null && item.getCategoryIds().length() > 0) {
-                String[] split = item.getCategoryIds().split(",");
-                for (String s : split) {
-                    builder.append(coscoCategoryService.getCategoryNameById(s).getCategoryName());
-                }
-            }
-            item.setCategoryName(builder.toString());
         });
         return supplierAnnualReviewStatistics;
     }

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

@@ -253,13 +253,13 @@
         when csb.supplier_type = 'ovs' then '境内'
         else '境内' end as area ,
         cats.id,
-        '准入单位' as accessUnit,
-        '准入部门' as accessDept,
+        '天津中远海运集装箱运输有限公司' as accessUnit,
+        '天津中远海运集装箱运输有限公司' as accessDept,
         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,
+        where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
         cat.annualreview_year
         from
         cosco_annualreview_task_supplier cats

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

@@ -384,11 +384,11 @@
         when csb.supplier_type = 'ovs' then '境内'
         else '境内' end as area ,
         csb.id,
-        (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,
-        '准入单位' as accessUnit,
-        '准入部门' as accessDept,
+        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

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

@@ -273,8 +273,8 @@
         '境内' ELSE '境内'
         END AS area,
         csq.id,
-        '准入单位' AS accessUnit,
-        '准入部门' AS accessDept,
+        '天津中远海运集装箱运输有限公司' AS accessUnit,
+        '天津中远海运集装箱运输有限公司' AS accessDept,
         (
         SELECT
         GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' )

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

@@ -251,9 +251,9 @@
             '退出部门' as accessDept,
             cse.create_by as applyUser,
             cse.update_time as applyTime,
-            (select GROUP_CONCAT( DISTINCT cssc.category_id 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 categoryIds
+             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