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 750abf7..b877154 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 @@ -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 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; } 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 96d10db..66fa9c4 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 @@ -257,9 +257,9 @@ '天津中远海运集装箱运输有限公司' 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 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 1a9bb82..458c9fc 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 @@ -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