liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改映射问题

Browse Source
This commit is contained in:
YY
2025-08-05 20:36:40 +08:00
parent 68ad06a8ee
commit d8e5a28d65
5 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
vo.getBasePageRequest().getPageSize()); vo.getBasePageRequest().getPageSize());
IPage<SupplierExitStatisticsVo> supplierExitStatistics = coscoSupplierexitMapper.getSupplierExitStatistics(p, vo); IPage<SupplierExitStatisticsVo> supplierExitStatistics = coscoSupplierexitMapper.getSupplierExitStatistics(p, vo);
supplierExitStatistics.getRecords().forEach(item -> { supplierExitStatistics.getRecords().forEach(item -> {
item.setCategoryName(item.getCategoryIds()); item.setCategoryName(item.getCategory());
SysUser userById = userService.getUserById(item.getApplyUser()); SysUser userById = userService.getUserById(item.getApplyUser());
if(userById!=null){ if(userById!=null){
SysOrg orgInfo = orgService.getOrgInfo(userById.getOrgId()); SysOrg orgInfo = orgService.getOrgInfo(userById.getOrgId());
@ -108,14 +108,6 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
return supplierExitStatistics; return supplierExitStatistics;
} }
private void getCateName(SupplierExitStatisticsVo item) {
if(item.getCategoryIds()!=null && item.getCategoryIds().length()>0){
String[] split = item.getCategoryIds().split(",");
List<String> 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()); vo.getBasePageRequest().getPageSize());
IPage<SupplierQualificationExpireVo> supplierExitStatistics = coscoSupplierQualificationsMapper.getSupplierExitStatistics(p, vo); IPage<SupplierQualificationExpireVo> supplierExitStatistics = coscoSupplierQualificationsMapper.getSupplierExitStatistics(p, vo);
supplierExitStatistics.getRecords().forEach(item -> { supplierExitStatistics.getRecords().forEach(item -> {
item.setCategoryName(item.getCategory());
}); });
return supplierExitStatistics; return supplierExitStatistics;
} }

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierExitStatisticsVo.java
View File

@ -45,7 +45,7 @@ public class SupplierExitStatisticsVo {
private String supplierId; private String supplierId;
private String categoryIds; private String category;
@ApiModelProperty(value = "分页对象信息") @ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest; private BasePageRequest basePageRequest;

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierQualificationExpireVo.java
View File

@ -63,7 +63,7 @@ public class SupplierQualificationExpireVo {
@ApiModelProperty(value = "分页对象信息") @ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest; private BasePageRequest basePageRequest;
private String categoryIds; private String category;
/** /**
* 资质名称 * 资质名称

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

@ -283,7 +283,7 @@
WHERE WHERE
casc.del_flag = 'normal' casc.del_flag = 'normal'
AND casc.supplier_id = csb.id AND casc.supplier_id = csb.id
) AS categoryName ) AS category
FROM FROM
cosco_supplier_qualifications csq cosco_supplier_qualifications csq
JOIN cosco_supplier_base csb ON csq.supplier_id = csb.id JOIN cosco_supplier_base csb ON csq.supplier_id = csb.id

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

@ -253,7 +253,7 @@
cse.update_time as applyTime, cse.update_time as applyTime,
(select GROUP_CONCAT( DISTINCT cssc.category_name SEPARATOR ', ' ) (select GROUP_CONCAT( DISTINCT cssc.category_name SEPARATOR ', ' )
from cosco_supplierexit_supplier_category cssc 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 from cosco_supplierexit cse
join cosco_supplierexit_supplier css join cosco_supplierexit_supplier css
on cse.id= css.supplierexit_id on cse.id= css.supplierexit_id