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-07-15 17:04:31 +08:00
parent 8c087005f3
commit a9677f9169
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java
View File

@ -1,12 +1,15 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.entity.SysUser;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
@ -36,6 +39,8 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
private CoscoEvaluateScoringResultMapper coscoEvaluateScoringResultMapper;
@Autowired
private CoscoEvaluateTemplateIndicatorNdMapper coscoEvaluateTemplateIndicatorNdMapper;
@Autowired
private IUserService userService;
/**
* 查询【供应商评价_评价任务关联供应商表】
@ -116,9 +121,19 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
IPage<SupplierDimensionVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
vo.getBasePageRequest().getPageSize());
IPage<SupplierDimensionVo> supplierDimensionVoIPage = coscoEvaluateTaskSupplierMapper.selectSupplierDimensionPage(p, vo);
List<UserVo> user = userService.getUser(new SelectUserVo());
Map<String ,UserVo> map = new HashMap<>();
user.forEach(userVo -> {
map.put(userVo.getUserId(), userVo);
});
List<String> deptIds = new ArrayList<>();
supplierDimensionVoIPage.getRecords().forEach(item -> {
deptIds.add(item.getDeptId());
UserVo userVo = map.get(item.getUserId());
if(userVo!=null){
item.setUserName(userVo.getUserName());
item.setDeptName(userVo.getUserDept());
}
});
//根据部门id查询评价单位
return supplierDimensionVoIPage;

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java
View File

@ -65,6 +65,10 @@ public class SupplierDimensionVo implements Serializable {
* 人员id
*/
private String userId;
/**
* 人员名称
*/
private String userName;
/**
* 任务id
@ -82,6 +86,7 @@ public class SupplierDimensionVo implements Serializable {
private String categoryName;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;
}

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

@ -284,6 +284,7 @@
cet.evaluate_theme evaluateTheme,
cet.start_time startTime,
cet.end_time endTime,
cetsu.user_id as userId,
case when cc.category_name is null then '未指定'
else cc.category_name end as categoryName,
cet.STATUS ,