bug修改

xuhy

1 天以前 8586161442cbe058fae93bfd35a468485b9b505e

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaProduceReportServiceImpl.java

@@ -2,14 +2,20 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.mapper.TQaProduceReportMapper;
import com.ruoyi.system.model.TQaProduceReport;
import com.ruoyi.system.query.TQaProduceReportQuery;
import com.ruoyi.system.service.TQaProduceReportService;
import com.ruoyi.system.vo.TQaProduceReportVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * <p>
@@ -22,6 +28,9 @@
@Service
public class TQaProduceReportServiceImpl extends ServiceImpl<TQaProduceReportMapper, TQaProduceReport> implements TQaProduceReportService {

    @Autowired
    private SysUserMapper sysUserMapper;

    @Override
    public PageInfo<TQaProduceReportVO> pageList(TQaProduceReportQuery query) {
        PageInfo<TQaProduceReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -33,7 +42,23 @@
    public PageInfo<TQaProduceReportVO> evaluateList(TQaProduceReportQuery query) {
        PageInfo<TQaProduceReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TQaProduceReportVO> list = this.baseMapper.evaluateList(query,pageInfo);
        if (CollectionUtils.isEmpty(list)){
            return pageInfo;
        }
        List<Long> evaluatePersonIds = list.stream().map(TQaProduceReportVO::getEvaluatePersonId).collect(Collectors.toList());
        List<SysUser> sysUsers = sysUserMapper.selectUserByIds(evaluatePersonIds);
        for (TQaProduceReportVO tQaProduceReportVO : list) {
            sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tQaProduceReportVO.getEvaluatePersonId())).forEach(sysUser -> {
                tQaProduceReportVO.setEvaluatePersonName(sysUser.getNickName());
            });
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public Map<String, Integer> evaluateCount(TQaProduceReportQuery query) {
        Map<String, Integer> map = this.baseMapper.evaluateCount(query);
        return map;
    }
}