保洁巡检
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2 天以前 b2e3d6532dbbb3929e01a598dcef7eb07f39b826 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/WorkbenchesController.java


@@ -115,12 +115,21 @@


            if (deptType == 1) {


                // 查询片区


                TProjectDept projectDept = projectDeptService.getById(deptId);


                // 查询项目部


                TProjectDept parent = projectDeptService.getById(projectDept.getParentId());


                List<TProjectDept> children = new ArrayList<>();


                children.add(projectDept);


                parent.setChildren(children);


                projectDeptList.add(parent);


                if("0".equals(projectDept.getParentId())){


                    // 查询项目部


                    List<TProjectDept> childProjectDept = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


                            .eq(TProjectDept::getStatus,1)


                            .eq(TProjectDept::getParentId,projectDept.getId()));


                    projectDept.setChildren(childProjectDept);


                    projectDeptList.add(projectDept);


                }else {


                    // 查询项目部


                    TProjectDept parent = projectDeptService.getById(projectDept.getParentId());


                    List<TProjectDept> children = new ArrayList<>();


                    children.add(projectDept);


                    parent.setChildren(children);


                    projectDeptList.add(parent);


                }


            }else {


                projectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


                        .eq(TProjectDept::getStatus,1)


@@ -180,8 +189,17 @@


            if (deptType == 1) {


                // 项目部人员


                if(CollectionUtils.isEmpty(query.getProjectId())){


                    TProjectDept projectDept = projectDeptService.getById(deptId);


                    List<String> projectIds = new ArrayList<>();


                    projectIds.add(deptId);


                    if("0".equals(projectDept.getParentId())){


                        List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


                                .eq(TProjectDept::getStatus, 1)


                                .eq(TProjectDept::getParentId, projectDept.getId()));


                        List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());


                        projectIds.addAll(ids);


                    }else {


                        projectIds.add(deptId);


                    }


                    query.setProjectId(projectIds);


                }


            }else {


@@ -203,6 +221,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


                // 查询点位数


                List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)


@@ -218,6 +237,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


        }else {


            // 超级管理员


            // 查询点位类型


@@ -246,6 +266,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


                List<TLocation> locationList = locationService.list(Wrappers.lambdaQuery(TLocation.class)


                        .in(TLocation::getProjectId, query.getProjectId()));


@@ -260,6 +281,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


        }




        // 查询任务相关数据


@@ -305,10 +327,9 @@


        Long userId = tokenService.getLoginUser().getUserId();




        TaskSituationVO taskSituationVO = new TaskSituationVO();




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




        if(StringUtils.isEmpty(query.getStartTime()) || StringUtils.isNotEmpty(query.getEndTime())){


        if(StringUtils.isEmpty(query.getStartTime()) || StringUtils.isEmpty(query.getEndTime())){


            LocalDate now = LocalDate.now();


            String startTime = now.minusDays(6) + " 00:00:00";


            String endTime = now + " 23:59:59";


@@ -337,15 +358,25 @@


            if (deptType == 1) {


                // 项目部人员


                if(CollectionUtils.isEmpty(query.getProjectId())){


                    TProjectDept projectDept = projectDeptService.getById(deptId);


                    List<String> projectIds = new ArrayList<>();


                    projectIds.add(deptId);


                    if("0".equals(projectDept.getParentId())){


                        List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


                                .eq(TProjectDept::getStatus, 1)


                                .eq(TProjectDept::getParentId, projectDept.getId()));


                        List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());


                        projectIds.addAll(ids);


                    }else {


                        projectIds.add(deptId);


                    }


                    query.setProjectId(projectIds);


                }


            }else {


                // 公司人员


                // 查询自己的任务列表


                taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)


                        .eq(TTask::getPatrolInspector, userId));


                        .eq(TTask::getPatrolInspector, userId)


                        .between(TTask::getImplementTime, query.getStartTime(), query.getEndTime()));


                if(CollectionUtils.isEmpty(query.getProjectId())){


                    // 查询所有项目部的任务列表


                    List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


@@ -360,6 +391,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -371,6 +403,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


        }else {


            // 超级管理员


            // 查询点位类型


@@ -384,7 +417,8 @@


                }


            }


            // 超级管理员 查询所有的任务列表


            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class));


            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)


                    .between(TTask::getImplementTime, query.getStartTime(), query.getEndTime()));


            if(CollectionUtils.isEmpty(query.getProjectId())){


                // 查询所有项目部的任务列表


                List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


@@ -398,6 +432,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -409,6 +444,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


        }


        // 任务总数


        taskSituationVO.setTotalTaskNum(list.size());


@@ -434,7 +470,7 @@


                }


            }


        }


        taskSituationVO.setPassRate(new BigDecimal(qualifiedWarn).divide(new BigDecimal(tasks.size()), 2, RoundingMode.HALF_UP));


        taskSituationVO.setPassRate(new BigDecimal(qualifiedWarn).divide(new BigDecimal(tasks.size()), 2, RoundingMode.HALF_DOWN));




        // 过滤每天的任务


        LocalDateTime start = DateUtils.stringToLocalDateTime(query.getStartTime());


@@ -445,17 +481,21 @@


        List<TaskSituationDayVO> taskSituationDayVOList = new ArrayList<>();




        LocalDateTime localDateTime = DateUtils.stringToLocalDateTime(query.getStartTime());


        String format = null;


        for (long i = 0; i <= daysBetween; i++) {


            TaskSituationDayVO taskSituationDayVO = new TaskSituationDayVO();


            String format;


            if(i == 0){


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


            }else {


                format = localDateTime.plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


                format = DateUtils.stringToLocalDate(format).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


            }


            taskSituationDayVO.setTaskTime(format);


            List<TTask> tTasks = list.stream().filter(task -> DateUtils.localDateTimeToString(task.getImplementTime()).contains(format)).collect(Collectors.toList());


            String finalFormat = format;


            List<TTask> tTasks = list.stream().filter(task -> DateUtils.localDateTimeToString(task.getImplementTime()).contains(finalFormat)).collect(Collectors.toList());


            // 任务数


            taskSituationDayVO.setTaskNum(tTasks.size());


            // 完成数


            taskSituationDayVO.setCompletedNum(tTasks.stream().filter(task -> task.getStatus() == 6).collect(Collectors.toList()).size());


            int qualifiedWarnChild = 0;


            for (TTask task : tTasks) {


                TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null);


@@ -465,7 +505,11 @@


                    }


                }


            }


            taskSituationDayVO.setCompleteRate(new BigDecimal(qualifiedWarnChild).divide(new BigDecimal(tTasks.size()), 2, RoundingMode.HALF_UP));


            if(tTasks.isEmpty()){


                taskSituationDayVO.setCompleteRate(BigDecimal.ZERO);


            }else {


                taskSituationDayVO.setCompleteRate(new BigDecimal(qualifiedWarnChild).divide(new BigDecimal(tTasks.size()), 2, RoundingMode.HALF_DOWN));


            }


            taskSituationDayVOList.add(taskSituationDayVO);


        }


        taskSituationVO.setTaskSituationDayVO(taskSituationDayVOList);


@@ -501,15 +545,25 @@


            if (deptType == 1) {


                // 项目部人员


                if(CollectionUtils.isEmpty(query.getProjectId())){


                    TProjectDept projectDept = projectDeptService.getById(deptId);


                    List<String> projectIds = new ArrayList<>();


                    projectIds.add(deptId);


                    if("0".equals(projectDept.getParentId())){


                        List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


                                .eq(TProjectDept::getStatus, 1)


                                .eq(TProjectDept::getParentId, projectDept.getId()));


                        List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());


                        projectIds.addAll(ids);


                    }else {


                        projectIds.add(deptId);


                    }


                    query.setProjectId(projectIds);


                }


            }else {


                // 公司人员


                // 查询自己的任务列表


                taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)


                        .eq(TTask::getPatrolInspector, userId));


                        .eq(TTask::getPatrolInspector, userId)


                        .between(TTask::getImplementTime, startTime, endTime));


                if(CollectionUtils.isEmpty(query.getProjectId())){


                    // 查询所有项目部的任务列表


                    List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


@@ -524,6 +578,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -535,6 +590,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


            List<TTask> result = list.stream().filter(task -> task.getStatus() == 2).collect(Collectors.toList());


            List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList());


            if(CollectionUtils.isEmpty(tasks)){


@@ -578,7 +634,8 @@


                }


            }


            // 超级管理员 查询所有的任务列表


            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class));


            List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)


                    .between(TTask::getImplementTime, startTime, endTime));


            if(CollectionUtils.isEmpty(query.getProjectId())){


                // 查询所有项目部的任务列表


                List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


@@ -592,6 +649,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -603,6 +661,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


            List<TTask> result = list.stream().filter(task -> task.getStatus() == 2).collect(Collectors.toList());


            List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList());


            if(CollectionUtils.isEmpty(tasks)){


@@ -662,8 +721,17 @@


            if (deptType == 1) {


                // 项目部人员


                if(CollectionUtils.isEmpty(query.getProjectId())){


                    TProjectDept projectDept = projectDeptService.getById(deptId);


                    List<String> projectIds = new ArrayList<>();


                    projectIds.add(deptId);


                    if("0".equals(projectDept.getParentId())){


                        List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


                                .eq(TProjectDept::getStatus, 1)


                                .eq(TProjectDept::getParentId, projectDept.getId()));


                        List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());


                        projectIds.addAll(ids);


                    }else {


                        projectIds.add(deptId);


                    }


                    query.setProjectId(projectIds);


                }


            }else {


@@ -685,6 +753,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -696,6 +765,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


            List<TTask> result = list.stream().filter(task -> task.getStatus() == 3).collect(Collectors.toList());


            for (TTask task : result) {


                TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null);


@@ -731,6 +801,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -742,6 +813,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


            List<TTask> result = list.stream().filter(task -> task.getStatus() == 3).collect(Collectors.toList());


            for (TTask task : result) {


                TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null);


@@ -757,8 +829,6 @@


    @PostMapping(value = "/cleaningQualitySummary")


    public R<Map<String, Object>> cleaningQualitySummary(@RequestBody DataStatisticsQuery query) {


        Map<String, Object> map = new HashMap<>();


        map.put("timeoutWarn", 0);


        map.put("unqualifiedWarn", 0);


        Integer deptType = tokenService.getLoginUser().getUser().getDeptType();


        String deptId = tokenService.getLoginUser().getUser().getDeptId();


        Long userId = tokenService.getLoginUser().getUserId();


@@ -778,8 +848,17 @@


            if (deptType == 1) {


                // 项目部人员


                if(CollectionUtils.isEmpty(query.getProjectId())){


                    TProjectDept projectDept = projectDeptService.getById(deptId);


                    List<String> projectIds = new ArrayList<>();


                    projectIds.add(deptId);


                    if("0".equals(projectDept.getParentId())){


                        List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


                                .eq(TProjectDept::getStatus, 1)


                                .eq(TProjectDept::getParentId, projectDept.getId()));


                        List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());


                        projectIds.addAll(ids);


                    }else {


                        projectIds.add(deptId);


                    }


                    query.setProjectId(projectIds);


                }


            }else {


@@ -801,6 +880,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -812,6 +892,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


            List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList());


            if(CollectionUtils.isEmpty(tasks)){


                map.put("unqualifiedWarn", 0);


@@ -867,6 +948,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -878,6 +960,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }


            list = list.stream().distinct().collect(Collectors.toList());


            List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList());


            if(CollectionUtils.isEmpty(tasks)){


                map.put("unqualifiedWarn", 0);


@@ -933,8 +1016,17 @@


            if (deptType == 1) {


                // 项目部人员


                if(CollectionUtils.isEmpty(query.getProjectId())){


                    TProjectDept projectDept = projectDeptService.getById(deptId);


                    List<String> projectIds = new ArrayList<>();


                    projectIds.add(deptId);


                    if("0".equals(projectDept.getParentId())){


                        List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)


                                .eq(TProjectDept::getStatus, 1)


                                .eq(TProjectDept::getParentId, projectDept.getId()));


                        List<String> ids = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());


                        projectIds.addAll(ids);


                    }else {


                        projectIds.add(deptId);


                    }


                    query.setProjectId(projectIds);


                }


            }else {


@@ -956,6 +1048,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -967,7 +1060,7 @@


            if(!CollectionUtils.isEmpty(taskList)){


                list.addAll(taskList);


            }




            list = list.stream().distinct().collect(Collectors.toList());


            List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList());


            if(CollectionUtils.isEmpty(tasks)){


                return R.ok();


@@ -976,6 +1069,7 @@


            List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)


                    .in(TTaskDetail::getTaskId, taskIds)


                    .eq(TTaskDetail::getClearStatus, 2)


                    .eq(TTaskDetail::getHandleType,1)


                    .orderByDesc(TTaskDetail::getCreateTime));


            List<TTaskDetail> taskDetailList = new ArrayList<>();


            for (TTask task : list) {


@@ -991,7 +1085,7 @@


                    .eq(TDictData::getDataType, 2));


            List<AnalysisUnqualifiedCleaningDetailVO> analysisUnqualifiedCleaningDetailVOS = new ArrayList<>();


            for (TDictData tDictData : dictDataList) {


                List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());


                List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> StringUtils.isNotEmpty(taskDetail.getUnqualified())&&taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());


                AnalysisUnqualifiedCleaningDetailVO analysisUnqualifiedCleaningDetailVO = new AnalysisUnqualifiedCleaningDetailVO();


                analysisUnqualifiedCleaningDetailVO.setUnqualifiedName(tDictData.getDataContent());


                analysisUnqualifiedCleaningDetailVO.setCount(tTaskDetails.size());


@@ -1025,6 +1119,7 @@




            // 查询片区


            if(!CollectionUtils.isEmpty(query.getProjectId())){


                query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList()));


                wrapper.in(TTask::getProjectId, query.getProjectId());


            }




@@ -1037,6 +1132,8 @@


                list.addAll(taskList);


            }




            list = list.stream().distinct().collect(Collectors.toList());




            List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList());


            if(CollectionUtils.isEmpty(tasks)){


                return R.ok();


@@ -1044,6 +1141,7 @@


            List<String> taskIds = tasks.stream().map(TTask::getId).collect(Collectors.toList());


            List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class)


                    .in(TTaskDetail::getTaskId, taskIds)


                    .eq(TTaskDetail::getHandleType,1)


                    .eq(TTaskDetail::getClearStatus, 2)


                    .orderByDesc(TTaskDetail::getCreateTime));


            List<TTaskDetail> taskDetailList = new ArrayList<>();


@@ -1060,7 +1158,7 @@


                    .eq(TDictData::getDataType, 2));


            List<AnalysisUnqualifiedCleaningDetailVO> analysisUnqualifiedCleaningDetailVOS = new ArrayList<>();


            for (TDictData tDictData : dictDataList) {


                List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());


                List<TTaskDetail> tTaskDetails = taskDetailList.stream().filter(taskDetail -> StringUtils.isNotEmpty(taskDetail.getUnqualified())&&taskDetail.getUnqualified().equals(tDictData.getId())).collect(Collectors.toList());


                AnalysisUnqualifiedCleaningDetailVO analysisUnqualifiedCleaningDetailVO = new AnalysisUnqualifiedCleaningDetailVO();


                analysisUnqualifiedCleaningDetailVO.setUnqualifiedName(tDictData.getDataContent());


                analysisUnqualifiedCleaningDetailVO.setCount(tTaskDetails.size());