Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 22d0531ef01ace7a66a0c5cc3e313944fe2ec8b4

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

@@ -20,6 +20,7 @@
import com.ruoyi.system.vo.system.TaskListVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
@@ -60,7 +61,6 @@
        }
        List<TTaskDetail> taskDetails = taskDetailMapper.selectList(Wrappers.lambdaQuery(TTaskDetail.class)
                .in(TTaskDetail::getTaskId, collect)
                .eq(TTaskDetail::getClearStatus, 2)
                .eq(TTaskDetail::getHandleType,1)
                .orderByDesc(TTaskDetail::getCreateTime));
        taskDetails = new ArrayList<>(taskDetails.stream()
@@ -163,16 +163,36 @@
        List<TDept> deptList = deptMapper.selectList(Wrappers.lambdaQuery(TDept.class));
        List<TProjectDept> projectDeptList = projectDeptMapper.selectList(Wrappers.lambdaQuery(TProjectDept.class));

        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
        }

        List<String> taskIds = list.stream().map(TLocationTaskListVO::getId).collect(Collectors.toList());
        List<TTaskDetail> taskDetails = taskDetailMapper.selectList(Wrappers.lambdaQuery(TTaskDetail.class)
                .in(TTaskDetail::getTaskId,taskIds)
                .orderByDesc(BaseModel::getCreateTime));

        for (TLocationTaskListVO tLocationTaskListVO : list) {
            if(tLocationTaskListVO.getDeptType()==1){
                projectDeptList.stream().filter(e -> e.getId().equals(tLocationTaskListVO.getDeptId())).findFirst().ifPresent(e -> {
                    tLocationTaskListVO.setDeptName(e.getProjectName());
                    if("0".equals(e.getParentId())){
                        tLocationTaskListVO.setDeptName(e.getProjectName());
                    }else {
                        projectDeptList.stream().filter(ee -> ee.getId().equals(e.getParentId())).findFirst().ifPresent(ee -> {
                            tLocationTaskListVO.setDeptName(ee.getProjectName());
                        });
                    }
                });
            }else {
                deptList.stream().filter(e -> e.getId().equals(tLocationTaskListVO.getDeptId())).findFirst().ifPresent(e -> {
                    tLocationTaskListVO.setDeptName(e.getDeptName());
                });
            }

            taskDetails.stream().filter(e -> e.getTaskId().equals(tLocationTaskListVO.getId())).findFirst().ifPresent(e -> {
                tLocationTaskListVO.setClearStatus(e.getClearStatus());
            });

        }
        pageInfo.setRecords(list);
        return pageInfo;