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


@@ -1089,6 +1089,8 @@


    @PostMapping(value = "/inspectorList")


    public R<List<InspectorVO>> inspectorList(@RequestBody InspectorQuery query) {


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


        List<TTask> listAll = taskCleanerService.list();


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


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


            List<String> projectIds = projectDeptService.lambdaQuery().like(TProjectDept::getProjectName, query.getDeptName()).list()


                    .stream().map(TProjectDept::getId).collect(Collectors.toList());


@@ -1159,12 +1161,13 @@


                if (tDept!=null)


                    inspectorVO.setDeptName(tDept.getDeptName());


            }


            inspectorVO.setTotal(inspectors.size());


            List<TInspector> status1 = inspectors.stream().filter(e -> e.getClearStatus() == 1).collect(Collectors.toList());


            List<TInspector> status2 = inspectors.stream().filter(e -> e.getClearStatus() == 2).collect(Collectors.toList());


            List<TInspector> status4 = inspectors.stream().filter(e -> e.getStatus() == 1).collect(Collectors.toList());


            List<TInspector> status5 = inspectors.stream().filter(e -> e.getStatus() == 2).collect(Collectors.toList());


            List<TInspector> status6 = inspectors.stream().filter(e -> e.getStatus() == 3).collect(Collectors.toList());


            List<TInspector> collect = inspectors.stream().filter(e -> listAllTaskIds.contains(e.getTaskId())).collect(Collectors.toList());


            inspectorVO.setTotal(collect.size());


            List<TInspector> status1 = collect.stream().filter(e -> e.getClearStatus() == 1).collect(Collectors.toList());


            List<TInspector> status2 = collect.stream().filter(e -> e.getClearStatus() == 2).collect(Collectors.toList());


            List<TInspector> status4 = collect.stream().filter(e -> e.getStatus() == 1).collect(Collectors.toList());


            List<TInspector> status5 = collect.stream().filter(e -> e.getStatus() == 2).collect(Collectors.toList());


            List<TInspector> status6 = collect.stream().filter(e -> e.getStatus() == 3).collect(Collectors.toList());




            inspectorVO.setNum1(status1.size());


            inspectorVO.setNum2(status2.size());