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 28d8d0c..cf0f859 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 @@ -16,6 +16,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.ArrayList; +import java.util.Arrays; import java.util.List; @Service @@ -97,7 +99,19 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { public IPage getSupplierExitStatistics(SupplierExitStatisticsVo vo) { IPage p = new Page<>(vo.getBasePageRequest().getPageNo(), vo.getBasePageRequest().getPageSize()); - return coscoSupplierexitMapper.getSupplierExitStatistics(p, vo); + IPage supplierExitStatistics = coscoSupplierexitMapper.getSupplierExitStatistics(p, vo); + supplierExitStatistics.getRecords().forEach(item -> { + getCateName(item); + }); + return supplierExitStatistics; + } + + private void getCateName(SupplierExitStatisticsVo item) { + if(item.getCategoryIds()!=null && item.getCategoryIds().length()>0){ + String[] split = item.getCategoryIds().split(","); + List categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split))); + item.setCategoryName(String.join(",", categoryNameListByIds)); + } } /** @@ -114,7 +128,15 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { public IPage getSupplierQualificationExpire(SupplierQualificationExpireVo vo) { IPage p = new Page<>(vo.getBasePageRequest().getPageNo(), vo.getBasePageRequest().getPageSize()); - return coscoSupplierQualificationsMapper.getSupplierExitStatistics(p, vo); + IPage supplierExitStatistics = coscoSupplierQualificationsMapper.getSupplierExitStatistics(p, vo); + supplierExitStatistics.getRecords().forEach(item -> { + if(item.getCategoryIds()!=null && item.getCategoryIds().length()>0){ + String[] split = item.getCategoryIds().split(","); + List categoryNameListByIds = coscoCategoryService.getCategoryNameListByIds(new ArrayList<>(Arrays.asList(split))); + item.setCategoryName(String.join(",", categoryNameListByIds)); + } + }); + return supplierExitStatistics; } /** 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 86d54ea..ffeef19 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 @@ -45,6 +45,8 @@ public class SupplierExitStatisticsVo { private String supplierId; + private String categoryIds; + @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; } 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 7894b35..8672fc1 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 @@ -62,4 +62,6 @@ public class SupplierQualificationExpireVo { @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; + + private String categoryIds; } 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 6264192..dd11e17 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 @@ -257,7 +257,8 @@ ORDER BY csq.term_of_validity ASC - SELECT csq.authority, csq.term_of_validity, @@ -275,14 +276,13 @@ '准入部门' AS accessDept, ( SELECT - GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' ) + GROUP_CONCAT( DISTINCT casc.category_id 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 categoryIds 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 7313967..1a9bb82 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,11 +251,9 @@ '退出部门' 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_id 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 + where cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as categoryIds from cosco_supplierexit cse join cosco_supplierexit_supplier css on cse.id= css.supplierexit_id