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 882e727..ac526e4 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 @@ -95,7 +95,7 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { vo.getBasePageRequest().getPageSize()); IPage supplierExitStatistics = coscoSupplierexitMapper.getSupplierExitStatistics(p, vo); supplierExitStatistics.getRecords().forEach(item -> { - item.setCategoryName(item.getCategoryIds()); + item.setCategoryName(item.getCategory()); SysUser userById = userService.getUserById(item.getApplyUser()); if(userById!=null){ SysOrg orgInfo = orgService.getOrgInfo(userById.getOrgId()); @@ -108,14 +108,6 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { 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)); - } - } - /** * 供应商退出统计查询 * @@ -132,7 +124,7 @@ public class DataStatisticeServiceImpl implements DataStatisticeService { vo.getBasePageRequest().getPageSize()); IPage supplierExitStatistics = coscoSupplierQualificationsMapper.getSupplierExitStatistics(p, vo); supplierExitStatistics.getRecords().forEach(item -> { - + item.setCategoryName(item.getCategory()); }); 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 ffeef19..0cd6ed1 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,7 +45,7 @@ public class SupplierExitStatisticsVo { private String supplierId; - private String categoryIds; + private String category; @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 3466194..08ff4b5 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 @@ -63,7 +63,7 @@ public class SupplierQualificationExpireVo { @ApiModelProperty(value = "分页对象信息") private BasePageRequest basePageRequest; - private String categoryIds; + private String category; /** * 资质名称 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 e20e71e..54af363 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 @@ -283,7 +283,7 @@ WHERE casc.del_flag = 'normal' AND casc.supplier_id = csb.id - ) AS categoryName + ) AS category 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 c673c25..9faaab8 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 @@ -253,7 +253,7 @@ 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 categoryIds + where cssc.supplier_id=csb.id and cssc.supplierexit_id=cse.id) as category from cosco_supplierexit cse join cosco_supplierexit_supplier css on cse.id= css.supplierexit_id