diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java index f6a5399..e96676d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java @@ -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 p = new Page<>(vo.getBasePageRequest().getPageNo(), vo.getBasePageRequest().getPageSize()); IPage supplierDimensionVoIPage = coscoEvaluateTaskSupplierMapper.selectSupplierDimensionPage(p, vo); + List user = userService.getUser(new SelectUserVo()); + Map map = new HashMap<>(); + user.forEach(userVo -> { + map.put(userVo.getUserId(), userVo); + }); + List 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; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java index 6eb5a7b..c783e31 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java @@ -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; } diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml index 01abeab..1f725b0 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml @@ -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 ,