保洁巡检
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2 天以前 54b54315510eed85fb81211cd4f4df25414bdf9a 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java


@@ -206,7 +206,7 @@


                                break;


                        }


                    }


                    LocalDateTime localDateTime = tTemplate.getCreateTime().plusDays(temp);


                    LocalDateTime localDateTime = tTemplate.getCreateTime().plusDays(temp-1);


                    stringBuilder.append(localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));


                    record.setTemplateDate(stringBuilder.toString());


                }


@@ -429,7 +429,10 @@


                for (LocationTypeListByProjectVO locationTypeListByProjectVO : locationTypeListByProjectVOS) {


                    LocationTypeListByProjectVO temp = new LocationTypeListByProjectVO();


                    BeanUtils.copyProperties(locationTypeListByProjectVO, temp);


                    List<String> locationIds = locations.stream().filter(e -> e.getLocationType().equals(locationTypeListByProjectVO.getId())).map(TLocation::getId).collect(Collectors.toList());


                    List<String> locationIds = locations.stream().filter(e ->


                            e.getProjectId().equals(projectDeptDetailsChildVO.getProjectId())&&


                            e.getLocationType().equals(locationTypeListByProjectVO.getId()))


                            .map(TLocation::getId).collect(Collectors.toList());


                    if (locationIds.isEmpty()) {


                        locationTypeListByProjectVO.setLocationNum(0);


                    } else {


@@ -707,8 +710,8 @@


        List<SysUser> sysUsers = sysUserService.selectAllList();


        LambdaQueryWrapper<TLeave> tLeaveLambdaQueryWrapper = new LambdaQueryWrapper<>();


        if (StringUtils.hasLength(query.getStartTime())){


            tLeaveLambdaQueryWrapper.ge(TLeave::getCreateTime, query.getStartTime());


            tLeaveLambdaQueryWrapper.le(TLeave::getCreateTime, query.getEndTime());


            tLeaveLambdaQueryWrapper.ge(TLeave::getCreateTime, query.getStartTime()+" :00:00:00");


            tLeaveLambdaQueryWrapper.le(TLeave::getCreateTime, query.getEndTime()+" :23:59:59");


        }


        tLeaveLambdaQueryWrapper.eq(TLeave::getAuditStatus,2);


        List<TLeave> leaves = leaveService.list(tLeaveLambdaQueryWrapper);


@@ -748,15 +751,15 @@


        List<PatrolInspectorVO> res = new ArrayList<>();


        LambdaQueryWrapper<TTask> tTaskLambdaQueryWrapper = new LambdaQueryWrapper<>();


        if (StringUtils.hasLength(query.getStartTime())){


            tTaskLambdaQueryWrapper.ge(TTask::getCreateTime, query.getStartTime());


            tTaskLambdaQueryWrapper.le(TTask::getCreateTime, query.getEndTime());


            tTaskLambdaQueryWrapper.ge(TTask::getCreateTime, query.getStartTime()+" :00:00:00");


            tTaskLambdaQueryWrapper.le(TTask::getCreateTime, query.getEndTime()+" :23:59:59");


        }


        if(query.getPatrolInspectorIds()!=null){


            tTaskLambdaQueryWrapper.in(TTask::getPatrolInspector, query.getPatrolInspectorIds());


            sysUsers = sysUsers.stream().filter(sysUser -> query.getPatrolInspectorIds().contains(sysUser.getUserId())).collect(Collectors.toList());


        }


        List<TTask> tasks = taskCleanerService.list(tTaskLambdaQueryWrapper);




        sysUsers = sysUsers.stream().filter(e -> e.getUserId() != 1).collect(Collectors.toList());


        for (SysUser sysUser : sysUsers) {




            PatrolInspectorVO patrolInspectorVO = new PatrolInspectorVO();


@@ -779,10 +782,22 @@


            }


            // 查询巡检员任务ids


            List<String> taskIds = tasks.stream().filter(e->e.getPatrolInspector().equals(sysUser.getUserId()+"")).map(TTask::getId).collect(Collectors.toList());


            if (taskIds.isEmpty()){


                taskIds.add("-1");


            }


            // 完成的任务


            List<String> taskIdsFinish = tasks.stream().filter(e->


                    (e.getStatus()==5 || e.getStatus()==6)


                    &&


                    e.getPatrolInspector().equals(sysUser.getUserId()+"")).map(TTask::getId).collect(Collectors.toList());




            if (taskIdsFinish.isEmpty()){


                taskIdsFinish.add("-1");


            }


            List<TTaskDetail> list = taskDetailService.lambdaQuery()


                    .eq(TTaskDetail::getAuditStatus, 1)


                    .isNotNull(TTaskDetail::getClearStatus).orderByDesc(BaseModel::getCreateTime)


                    .in(!taskIds.isEmpty(), TTaskDetail::getTaskId,taskIds).groupBy(TTaskDetail::getTaskId).list();


                    .in(!taskIds.isEmpty(), TTaskDetail::getTaskId,taskIdsFinish).groupBy(TTaskDetail::getTaskId).list();


            // 查询clearStatus为1的数量


            List<TTaskDetail> clearStatus1 = list.stream().filter(e -> e.getClearStatus().equals(1)).collect(Collectors.toList());


            List<TTaskDetail> clearStatus2 = list.stream().filter(e -> e.getClearStatus().equals(2)).collect(Collectors.toList());


@@ -873,6 +888,7 @@


            sysUsers = sysUsers.stream().filter(sysUser -> query.getPatrolInspectorIds().contains(sysUser.getUserId())).collect(Collectors.toList());


        }


        List<TTask> tasks = taskCleanerService.list(tTaskLambdaQueryWrapper);


        sysUsers = sysUsers.stream().filter(e -> e.getUserId() != 1).collect(Collectors.toList());




        for (SysUser sysUser : sysUsers) {




@@ -896,10 +912,22 @@


            }


            // 查询巡检员任务ids


            List<String> taskIds = tasks.stream().filter(e->e.getPatrolInspector().equals(sysUser.getUserId()+"")).map(TTask::getId).collect(Collectors.toList());


            if (taskIds.isEmpty()){


                taskIds.add("-1");


            }


            // 完成的任务


            List<String> taskIdsFinish = tasks.stream().filter(e->


                    (e.getStatus()==5 || e.getStatus()==6)


                            &&


                            e.getPatrolInspector().equals(sysUser.getUserId()+"")).map(TTask::getId).collect(Collectors.toList());




            if (taskIdsFinish.isEmpty()){


                taskIdsFinish.add("-1");


            }


            List<TTaskDetail> list = taskDetailService.lambdaQuery()


                    .eq(TTaskDetail::getAuditStatus, 1)


                    .isNotNull(TTaskDetail::getClearStatus).orderByDesc(BaseModel::getCreateTime)


                    .in(!taskIds.isEmpty(), TTaskDetail::getTaskId,taskIds).groupBy(TTaskDetail::getTaskId).list();


                    .in(!taskIds.isEmpty(), TTaskDetail::getTaskId,taskIdsFinish).groupBy(TTaskDetail::getTaskId).list();


            // 查询clearStatus为1的数量


            List<TTaskDetail> clearStatus1 = list.stream().filter(e -> e.getClearStatus().equals(1)).collect(Collectors.toList());


            List<TTaskDetail> clearStatus2 = list.stream().filter(e -> e.getClearStatus().equals(2)).collect(Collectors.toList());


@@ -1004,6 +1032,7 @@


        }


        List<InspectorVO> res = new ArrayList<>();


        List<TInspector> inspectors = inspectorService.list(tTaskLambdaQueryWrapper);


        sysUsers = sysUsers.stream().filter(e -> e.getUserId() != 1).collect(Collectors.toList());


        for (SysUser sysUser : sysUsers) {


            InspectorVO inspectorVO = new InspectorVO();


            inspectorVO.setNickName(sysUser.getNickName());


@@ -1091,6 +1120,8 @@


        }


        List<InspectorVO> res = new ArrayList<>();


        List<TInspector> inspectors = inspectorService.list(tTaskLambdaQueryWrapper);


        sysUsers = sysUsers.stream().filter(e -> e.getUserId() != 1).collect(Collectors.toList());




        for (SysUser sysUser : sysUsers) {


            InspectorVO inspectorVO = new InspectorVO();


            inspectorVO.setNickName(sysUser.getNickName());