保洁巡检本周代码

无关风月

5 小时以前 5e2d78f61bf7d1513d5d5c8cd55442133a6e898e

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

@@ -44,6 +44,44 @@
        PageInfo<InspectorListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<InspectorListVO> list = this.baseMapper.pageList(query,pageInfo);


        List<TTask> tTasks = taskMapper.selectList(null);
        for (InspectorListVO taskListVO : list) {
            TTask tTask = tTasks.stream().filter(e -> e.getId().equals(taskListVO.getTaskId())).findFirst().orElse(null);
            if (tTask!=null){
                taskListVO.setTaskType(tTask.getTaskType());
                SysUser sysUser = sysUsers.stream().filter(e -> e.getUserId().equals(Long.valueOf(tTask.getPatrolInspector()))).findFirst().orElse(null);
                if (sysUser!=null){
                    if (sysUser.getDeptType()==2){
                        TDept tDept = deptMapper.selectById(tTask.getPatrolInspectorDept());
                        if (tDept!=null){
                            taskListVO.setDeptName(tDept.getDeptName());
                        }

                    }else{
                        TProjectDept tProjectDept = projectDeptMapper.selectById(sysUser.getDeptId());
                        if (tProjectDept != null) {
                            if (!tProjectDept.getParentId().equals("0")) {
                                TProjectDept tProjectDept1 = projectDeptMapper.selectById(tProjectDept.getParentId());
                                if (tProjectDept1 != null) {
                                    taskListVO.setDeptName(tProjectDept1.getProjectName() + ">" + tProjectDept.getProjectName());
                                }
                            } else {
                                taskListVO.setDeptName(tProjectDept.getProjectName());
                            }
                        }
                    }
                }
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
    public List<InspectorListVO> pageListExport(InsepectorListQuery query) {
        List<SysUser> sysUsers = sysUserMapper.selectAllList();
        PageInfo<InspectorListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<InspectorListVO> list = this.baseMapper.pageListExport(query,pageInfo);

        List<TTaskDetail> tTaskDetails = taskDetailMapper.selectList(new LambdaQueryWrapper<TTaskDetail>()
                .orderByDesc(BaseModel::getCreateTime)
                .in(TTaskDetail::getHandleType, Arrays.asList(1,4)));
@@ -76,6 +114,6 @@
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
        return list;
    }
}