| | |
| | | private TCleanerService cleanerService; |
| | | @Resource |
| | | private TLeaveService leaveService; |
| | | |
| | | @Resource |
| | | private TEarlyWarningService earlyWarningService; |
| | | @ApiOperation(value = "查询部门 项目部列表 不分页") |
| | | @GetMapping(value = "/listDepts") |
| | | public R<List<DeptNoLimitVO>> listDepts() { |
| | |
| | | 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) |
| | |
| | | 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.add(projectDept.getId()); |
| | | projectIds.addAll(ids); |
| | | }else { |
| | | projectIds.add(deptId); |
| | | } |
| | | query.setProjectId(projectIds); |
| | | } |
| | | |
| | | // 巡检员数 |
| | | Integer totalEmployeeNum = sysUserService.selectUserCount(query.getProjectId(),deptType); |
| | | map.put("totalEmployeeNum", totalEmployeeNum); |
| | | }else { |
| | | // 公司人员 |
| | | // 查询自己的任务列表 |
| | |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | | } |
| | | } |
| | | // 巡检员数 |
| | | Integer totalEmployeeNum = sysUserService.selectUserCount(query.getProjectId(),1); |
| | | map.put("totalEmployeeNum", totalEmployeeNum+1); |
| | | } |
| | | |
| | | // 查询片区 |
| | | 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) |
| | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | }else { |
| | | // 超级管理员 |
| | | // 查询点位类型 |
| | |
| | | map.put("totalLocationNum", locationList.size()); |
| | | } |
| | | // 超级管理员 查询所有的任务列表 |
| | | List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | List<TTask> taskList = new ArrayList<>(); |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | 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())); |
| | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | |
| | | // 巡检员数 |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | Integer totalEmployeeNum = sysUserService.selectUserCount(query.getProjectId(),deptType); |
| | | Integer totalEmployeeNum1 = sysUserService.selectUserCount(query.getProjectId(),1); |
| | | map.put("totalEmployeeNum", totalEmployeeNum+totalEmployeeNum1); |
| | | }else { |
| | | Integer totalEmployeeNum = sysUserService.selectUserCount(query.getProjectId(),1); |
| | | map.put("totalEmployeeNum", totalEmployeeNum); |
| | | } |
| | | } |
| | | |
| | | // 查询任务相关数据 |
| | |
| | | map.put("waitTaskNum", list.stream().filter(tTask -> tTask.getStatus() == 1).count()); |
| | | |
| | | // 总计员工数 |
| | | Integer totalEmployeeNum = sysUserService.selectUserCount(query.getProjectId(),deptType); |
| | | if (deptType != 1) { |
| | | totalEmployeeNum = totalEmployeeNum + 1; |
| | | } |
| | | map.put("totalEmployeeNum", totalEmployeeNum); |
| | | // Integer totalEmployeeNum = sysUserService.selectUserCount(null,deptType); |
| | | // if (deptType != 1) { |
| | | // totalEmployeeNum = totalEmployeeNum + 1; |
| | | // } |
| | | // map.put("totalEmployeeNum", totalEmployeeNum); |
| | | |
| | | // 今日请假员工数量 |
| | | List<TLeave> leaves = leaveService.list(Wrappers.lambdaQuery(TLeave.class) |
| | |
| | | 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"; |
| | |
| | | } |
| | | |
| | | wrapper.between(TTask::getImplementTime, query.getStartTime(), query.getEndTime()); |
| | | |
| | | // 过滤每天的任务 |
| | | LocalDateTime start = DateUtils.stringToLocalDateTime(query.getStartTime()); |
| | | LocalDateTime end = DateUtils.stringToLocalDateTime(query.getEndTime()); |
| | | |
| | | long daysBetween = ChronoUnit.DAYS.between(start, end); |
| | | List<TaskSituationDayVO> taskSituationDayVOList = new ArrayList<>(); |
| | | |
| | | LocalDateTime localDateTime = DateUtils.stringToLocalDateTime(query.getStartTime()); |
| | | String format = null; |
| | | |
| | | List<TTask> list; |
| | | if (userId != 1L) { |
| | |
| | | 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.add(projectDept.getId()); |
| | | 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) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | | list = taskCleanService.list(wrapper); |
| | | if(CollectionUtils.isEmpty(list)){ |
| | | return R.ok(); |
| | | for (long i = 0; i <= daysBetween; i++) { |
| | | TaskSituationDayVO taskSituationDayVO = new TaskSituationDayVO(); |
| | | if(i == 0){ |
| | | format = localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); |
| | | }else { |
| | | format = DateUtils.stringToLocalDate(format).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); |
| | | } |
| | | taskSituationDayVO.setTaskTime(format); |
| | | // 任务数 |
| | | taskSituationDayVO.setTaskNum(0); |
| | | // 完成数 |
| | | taskSituationDayVO.setCompletedNum(0); |
| | | taskSituationDayVO.setCompleteRate(BigDecimal.ZERO); |
| | | taskSituationDayVOList.add(taskSituationDayVO); |
| | | } |
| | | taskSituationVO.setTaskSituationDayVO(taskSituationDayVOList); |
| | | return R.ok(taskSituationVO); |
| | | } |
| | | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | }else { |
| | | // 超级管理员 |
| | | // 查询点位类型 |
| | |
| | | } |
| | | } |
| | | // 超级管理员 查询所有的任务列表 |
| | | List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | List<TTask> taskList = new ArrayList<>(); |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) |
| | | .between(TTask::getImplementTime, query.getStartTime(), query.getEndTime())); |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | | list = taskCleanService.list(wrapper); |
| | | if(CollectionUtils.isEmpty(list)){ |
| | | return R.ok(); |
| | | for (long i = 0; i <= daysBetween; i++) { |
| | | TaskSituationDayVO taskSituationDayVO = new TaskSituationDayVO(); |
| | | if(i == 0){ |
| | | format = localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); |
| | | }else { |
| | | format = DateUtils.stringToLocalDate(format).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); |
| | | } |
| | | taskSituationDayVO.setTaskTime(format); |
| | | // 任务数 |
| | | taskSituationDayVO.setTaskNum(0); |
| | | // 完成数 |
| | | taskSituationDayVO.setCompletedNum(0); |
| | | taskSituationDayVO.setCompleteRate(BigDecimal.ZERO); |
| | | taskSituationDayVOList.add(taskSituationDayVO); |
| | | } |
| | | taskSituationVO.setTaskSituationDayVO(taskSituationDayVOList); |
| | | return R.ok(taskSituationVO); |
| | | } |
| | | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | } |
| | | // 任务总数 |
| | | taskSituationVO.setTotalTaskNum(list.size()); |
| | | List<TTask> result = list.stream().filter(task -> task.getStatus() == 6).collect(Collectors.toList()); |
| | | List<TTask> result = list.stream().filter(task -> task.getStatus() == 6 || task.getStatus() == 5).collect(Collectors.toList()); |
| | | // 已完成任务数 |
| | | taskSituationVO.setCompletedTaskNum(result.size()); |
| | | // 匹配任务详情查看合格数量 |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList()); |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2 |
| | | && task.getStatus() != 3 && task.getStatus() != 4).collect(Collectors.toList()); |
| | | if(CollectionUtils.isEmpty(tasks)){ |
| | | taskSituationVO.setPassRate(BigDecimal.ZERO); |
| | | for (long i = 0; i <= daysBetween; i++) { |
| | | TaskSituationDayVO taskSituationDayVO = new TaskSituationDayVO(); |
| | | if(i == 0){ |
| | | format = localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); |
| | | }else { |
| | | format = DateUtils.stringToLocalDate(format).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); |
| | | } |
| | | taskSituationDayVO.setTaskTime(format); |
| | | // 任务数 |
| | | taskSituationDayVO.setTaskNum(0); |
| | | // 完成数 |
| | | taskSituationDayVO.setCompletedNum(0); |
| | | taskSituationDayVO.setCompleteRate(BigDecimal.ZERO); |
| | | taskSituationDayVOList.add(taskSituationDayVO); |
| | | } |
| | | taskSituationVO.setTaskSituationDayVO(taskSituationDayVOList); |
| | | return R.ok(taskSituationVO); |
| | | } |
| | | List<String> taskIds = tasks.stream().map(TTask::getId).collect(Collectors.toList()); |
| | |
| | | } |
| | | } |
| | | } |
| | | taskSituationVO.setPassRate(new BigDecimal(qualifiedWarn).divide(new BigDecimal(tasks.size()), 2, RoundingMode.HALF_UP)); |
| | | |
| | | // 过滤每天的任务 |
| | | LocalDateTime start = DateUtils.stringToLocalDateTime(query.getStartTime()); |
| | | LocalDateTime end = DateUtils.stringToLocalDateTime(query.getEndTime()); |
| | | |
| | | long daysBetween = ChronoUnit.DAYS.between(start, end); |
| | | |
| | | List<TaskSituationDayVO> taskSituationDayVOList = new ArrayList<>(); |
| | | |
| | | LocalDateTime localDateTime = DateUtils.stringToLocalDateTime(query.getStartTime()); |
| | | taskSituationVO.setPassRate(new BigDecimal(qualifiedWarn).divide(new BigDecimal(tasks.size()), 2, RoundingMode.HALF_DOWN)); |
| | | 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 || task.getStatus() == 5).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); |
| | |
| | | } |
| | | } |
| | | } |
| | | 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(taskSituationDayVO.getCompletedNum()), 2, RoundingMode.HALF_DOWN)); |
| | | } |
| | | taskSituationDayVOList.add(taskSituationDayVO); |
| | | } |
| | | taskSituationVO.setTaskSituationDayVO(taskSituationDayVOList); |
| | |
| | | LambdaQueryWrapper<TTask> wrapper = new LambdaQueryWrapper<>(); |
| | | String startTime = LocalDate.now() + " 00:00:00"; |
| | | String endTime = LocalDate.now() + " 23:59:59"; |
| | | wrapper.between(TTask::getImplementTime, startTime, endTime); |
| | | // wrapper.between(TTask::getImplementTime, startTime, endTime); |
| | | if (userId != 1L) { |
| | | // 查询点位类型 |
| | | if(StringUtils.isNotEmpty(query.getLocationTypeId())){ |
| | |
| | | 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.add(projectDept.getId()); |
| | | projectIds.addAll(ids); |
| | | }else { |
| | | projectIds.add(deptId); |
| | | } |
| | | query.setProjectId(projectIds); |
| | | } |
| | | }else { |
| | |
| | | // 查询自己的任务列表 |
| | | taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) |
| | | .eq(TTask::getPatrolInspector, userId)); |
| | | // taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class) |
| | | // .eq(TTask::getPatrolInspector, userId) |
| | | // .between(TTask::getImplementTime, startTime, endTime)); |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | | List<TTask> list = taskCleanService.list(wrapper); |
| | | if(CollectionUtils.isEmpty(list)){ |
| | | return R.ok(); |
| | | return R.ok(new ArrayList<>()); |
| | | } |
| | | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | 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)){ |
| | | for (TTask task : result) { |
| | | TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null); |
| | | if(Objects.nonNull(tLocation)) { |
| | | task.setLocationName(tLocation.getLocationName()); |
| | | } |
| | | } |
| | | return R.ok(result); |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | |
| | | // 查询预警数据 |
| | | List<TEarlyWarning> earlyWarnings = earlyWarningService.list(Wrappers.lambdaQuery(TEarlyWarning.class) |
| | | .between(TEarlyWarning::getCreateTime, startTime, endTime)); |
| | | |
| | | if(CollectionUtils.isEmpty(earlyWarnings)){ |
| | | return R.ok(new ArrayList<>()); |
| | | } |
| | | List<String> taskIds = tasks.stream().map(TTask::getId).collect(Collectors.toList()); |
| | | List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class) |
| | | .in(TTaskDetail::getTaskId, taskIds) |
| | | .orderByDesc(TTaskDetail::getCreateTime)); |
| | | for (TTask task : list) { |
| | | TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null); |
| | | if(Objects.nonNull(tTaskDetail)){ |
| | | if(Objects.nonNull(tTaskDetail.getClearStatus()) && tTaskDetail.getClearStatus() == 2){ |
| | | result.add(task); |
| | | } |
| | | |
| | | String taskIds = earlyWarnings.stream().map(TEarlyWarning::getTaskId).collect(Collectors.joining(",")); |
| | | |
| | | Iterator<TTask> iterator = list.iterator(); |
| | | while (iterator.hasNext()) { |
| | | TTask task = iterator.next(); |
| | | if(!taskIds.contains(task.getId())){ |
| | | iterator.remove(); |
| | | } |
| | | } |
| | | for (TTask task : result) { |
| | | TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null); |
| | | if(Objects.nonNull(tLocation)) { |
| | | task.setLocationName(tLocation.getLocationName()); |
| | | } |
| | | } |
| | | return R.ok(result); |
| | | |
| | | // 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)){ |
| | | // for (TTask task : result) { |
| | | // TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null); |
| | | // if(Objects.nonNull(tLocation)) { |
| | | // task.setLocationName(tLocation.getLocationName()); |
| | | // } |
| | | // } |
| | | // return R.ok(result); |
| | | // } |
| | | // List<String> taskIds = tasks.stream().map(TTask::getId).collect(Collectors.toList()); |
| | | // List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class) |
| | | // .in(TTaskDetail::getTaskId, taskIds) |
| | | // .orderByDesc(TTaskDetail::getCreateTime)); |
| | | // for (TTask task : list) { |
| | | // TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null); |
| | | // if(Objects.nonNull(tTaskDetail)){ |
| | | // if(Objects.nonNull(tTaskDetail.getClearStatus()) && tTaskDetail.getClearStatus() == 2){ |
| | | // result.add(task); |
| | | // } |
| | | // } |
| | | // } |
| | | // for (TTask task : result) { |
| | | // TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null); |
| | | // if(Objects.nonNull(tLocation)) { |
| | | // task.setLocationName(tLocation.getLocationName()); |
| | | // } |
| | | // } |
| | | return R.ok(list); |
| | | }else { |
| | | // 超级管理员 |
| | | // 查询点位类型 |
| | |
| | | } |
| | | } |
| | | // 超级管理员 查询所有的任务列表 |
| | | 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) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | | List<TTask> list = taskCleanService.list(wrapper); |
| | | if(CollectionUtils.isEmpty(list)){ |
| | | return R.ok(); |
| | | return R.ok(new ArrayList<>()); |
| | | } |
| | | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | 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)){ |
| | | for (TTask task : result) { |
| | | TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null); |
| | | if(Objects.nonNull(tLocation)) { |
| | | task.setLocationName(tLocation.getLocationName()); |
| | | } |
| | | } |
| | | return R.ok(result); |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | |
| | | // 查询预警数据 |
| | | List<TEarlyWarning> earlyWarnings = earlyWarningService.list(Wrappers.lambdaQuery(TEarlyWarning.class) |
| | | .between(TEarlyWarning::getCreateTime, startTime, endTime)); |
| | | |
| | | if(CollectionUtils.isEmpty(earlyWarnings)){ |
| | | return R.ok(new ArrayList<>()); |
| | | } |
| | | List<String> taskIds = tasks.stream().map(TTask::getId).collect(Collectors.toList()); |
| | | List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class) |
| | | .in(TTaskDetail::getTaskId, taskIds) |
| | | .orderByDesc(TTaskDetail::getCreateTime)); |
| | | for (TTask task : list) { |
| | | TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null); |
| | | if(Objects.nonNull(tTaskDetail)){ |
| | | if(Objects.nonNull(tTaskDetail.getClearStatus()) && tTaskDetail.getClearStatus() == 2){ |
| | | result.add(task); |
| | | } |
| | | |
| | | String taskIds = earlyWarnings.stream().map(TEarlyWarning::getTaskId).collect(Collectors.joining(",")); |
| | | |
| | | Iterator<TTask> iterator = list.iterator(); |
| | | while (iterator.hasNext()) { |
| | | TTask task = iterator.next(); |
| | | if(!taskIds.contains(task.getId())){ |
| | | iterator.remove(); |
| | | } |
| | | } |
| | | for (TTask task : result) { |
| | | TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null); |
| | | if(Objects.nonNull(tLocation)) { |
| | | task.setLocationName(tLocation.getLocationName()); |
| | | } |
| | | } |
| | | return R.ok(result); |
| | | |
| | | // 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)){ |
| | | // for (TTask task : result) { |
| | | // TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null); |
| | | // if(Objects.nonNull(tLocation)) { |
| | | // task.setLocationName(tLocation.getLocationName()); |
| | | // } |
| | | // } |
| | | // return R.ok(result); |
| | | // } |
| | | // List<String> taskIds = tasks.stream().map(TTask::getId).collect(Collectors.toList()); |
| | | // List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class) |
| | | // .in(TTaskDetail::getTaskId, taskIds) |
| | | // .orderByDesc(TTaskDetail::getCreateTime)); |
| | | // for (TTask task : list) { |
| | | // TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null); |
| | | // if(Objects.nonNull(tTaskDetail)){ |
| | | // if(Objects.nonNull(tTaskDetail.getClearStatus()) && tTaskDetail.getClearStatus() == 2){ |
| | | // result.add(task); |
| | | // } |
| | | // } |
| | | // } |
| | | // for (TTask task : result) { |
| | | // TLocation tLocation = locations.stream().filter(location -> location.getId().equals(task.getLocationId())).findFirst().orElse(null); |
| | | // if(Objects.nonNull(tLocation)) { |
| | | // task.setLocationName(tLocation.getLocationName()); |
| | | // } |
| | | // } |
| | | return R.ok(list); |
| | | } |
| | | } |
| | | |
| | |
| | | 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.add(projectDept.getId()); |
| | | projectIds.addAll(ids); |
| | | }else { |
| | | projectIds.add(deptId); |
| | | } |
| | | query.setProjectId(projectIds); |
| | | } |
| | | }else { |
| | |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | |
| | | 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); |
| | |
| | | } |
| | | } |
| | | // 超级管理员 查询所有的任务列表 |
| | | List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | List<TTask> taskList = new ArrayList<>(); |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | |
| | | 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); |
| | |
| | | @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(); |
| | |
| | | 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.add(projectDept.getId()); |
| | | projectIds.addAll(ids); |
| | | }else { |
| | | projectIds.add(deptId); |
| | | } |
| | | query.setProjectId(projectIds); |
| | | } |
| | | }else { |
| | |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList()); |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2 |
| | | && task.getStatus() != 3 && task.getStatus() != 4).collect(Collectors.toList()); |
| | | if(CollectionUtils.isEmpty(tasks)){ |
| | | map.put("unqualifiedWarn", 0); |
| | | map.put("qualifiedWarn", 0); |
| | |
| | | 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) |
| | | .orderByDesc(TTaskDetail::getCreateTime)); |
| | | |
| | | taskDetails = new ArrayList<>(taskDetails.stream() |
| | | .collect(Collectors.groupingBy( |
| | | TTaskDetail::getTaskId, |
| | | Collectors.collectingAndThen( |
| | | Collectors.toList(), |
| | | list1 -> list1.get(0) |
| | | ) |
| | | )) |
| | | .values()); |
| | | |
| | | int unqualifiedWarn = 0; |
| | | int qualifiedWarn = 0; |
| | | for (TTask task : list) { |
| | |
| | | } |
| | | } |
| | | // 超级管理员 查询所有的任务列表 |
| | | List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | List<TTask> taskList = new ArrayList<>(); |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList()); |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2 |
| | | && task.getStatus() != 3 && task.getStatus() != 4).collect(Collectors.toList()); |
| | | if(CollectionUtils.isEmpty(tasks)){ |
| | | map.put("unqualifiedWarn", 0); |
| | | map.put("qualifiedWarn", 0); |
| | |
| | | List<TTaskDetail> taskDetails = tTaskDetailService.list(Wrappers.lambdaQuery(TTaskDetail.class) |
| | | .in(TTaskDetail::getTaskId, taskIds) |
| | | .orderByDesc(TTaskDetail::getCreateTime)); |
| | | taskDetails = new ArrayList<>(taskDetails.stream() |
| | | .collect(Collectors.groupingBy( |
| | | TTaskDetail::getTaskId, |
| | | Collectors.collectingAndThen( |
| | | Collectors.toList(), |
| | | list1 -> list1.get(0) |
| | | ) |
| | | )) |
| | | .values()); |
| | | int unqualifiedWarn = 0; |
| | | int qualifiedWarn = 0; |
| | | for (TTask task : list) { |
| | |
| | | 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.add(projectDept.getId()); |
| | | projectIds.addAll(ids); |
| | | }else { |
| | | projectIds.add(deptId); |
| | | } |
| | | query.setProjectId(projectIds); |
| | | } |
| | | }else { |
| | |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList()); |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2 |
| | | && task.getStatus() != 3 && task.getStatus() != 4).collect(Collectors.toList()); |
| | | if(CollectionUtils.isEmpty(tasks)){ |
| | | return R.ok(); |
| | | return R.ok(analysisUnqualifiedCleaningVO); |
| | | } |
| | | 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::getClearStatus, 2) |
| | | .eq(TTaskDetail::getHandleType,1) |
| | | .orderByDesc(TTaskDetail::getCreateTime)); |
| | | taskDetails = new ArrayList<>(taskDetails.stream() |
| | | .collect(Collectors.groupingBy( |
| | | TTaskDetail::getTaskId, |
| | | Collectors.collectingAndThen( |
| | | Collectors.toList(), |
| | | listAll -> listAll.get(0) |
| | | ) |
| | | )) |
| | | .values()); |
| | | List<TTaskDetail> taskDetailList = new ArrayList<>(); |
| | | for (TTask task : list) { |
| | | TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null); |
| | |
| | | .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()); |
| | |
| | | } |
| | | } |
| | | // 超级管理员 查询所有的任务列表 |
| | | List<TTask> taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | List<TTask> taskList = new ArrayList<>(); |
| | | if(CollectionUtils.isEmpty(query.getProjectId())){ |
| | | taskList = taskCleanService.list(Wrappers.lambdaQuery(TTask.class)); |
| | | // 查询所有项目部的任务列表 |
| | | List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class) |
| | | .eq(TProjectDept::getStatus, 1) |
| | | .ne(TProjectDept::getParentId, 0)); |
| | | .eq(TProjectDept::getStatus, 1)); |
| | | if(!CollectionUtils.isEmpty(tProjectDeptList)){ |
| | | List<String> projectIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList()); |
| | | query.setProjectId(projectIds); |
| | |
| | | |
| | | // 查询片区 |
| | | if(!CollectionUtils.isEmpty(query.getProjectId())){ |
| | | query.setProjectId(query.getProjectId().stream().distinct().collect(Collectors.toList())); |
| | | wrapper.in(TTask::getProjectId, query.getProjectId()); |
| | | } |
| | | |
| | | List<TTask> list = taskCleanService.list(wrapper); |
| | | if(CollectionUtils.isEmpty(list)){ |
| | | return R.ok(); |
| | | return R.ok(analysisUnqualifiedCleaningVO); |
| | | } |
| | | |
| | | if(!CollectionUtils.isEmpty(taskList)){ |
| | | list.addAll(taskList); |
| | | } |
| | | |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2).collect(Collectors.toList()); |
| | | list = list.stream().distinct().collect(Collectors.toList()); |
| | | |
| | | List<TTask> tasks = list.stream().filter(task -> task.getStatus() != 1 && task.getStatus() != 2 |
| | | && task.getStatus() != 3 && task.getStatus() != 4).collect(Collectors.toList()); |
| | | if(CollectionUtils.isEmpty(tasks)){ |
| | | return R.ok(); |
| | | return R.ok(analysisUnqualifiedCleaningVO); |
| | | } |
| | | 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)); |
| | | taskDetails = new ArrayList<>(taskDetails.stream() |
| | | .collect(Collectors.groupingBy( |
| | | TTaskDetail::getTaskId, |
| | | Collectors.collectingAndThen( |
| | | Collectors.toList(), |
| | | listAll -> listAll.get(0) |
| | | ) |
| | | )) |
| | | .values()); |
| | | List<TTaskDetail> taskDetailList = new ArrayList<>(); |
| | | for (TTask task : list) { |
| | | TTaskDetail tTaskDetail = taskDetails.stream().filter(taskDetail -> taskDetail.getTaskId().equals(task.getId())).findFirst().orElse(null); |
| | |
| | | .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()); |
| | | analysisUnqualifiedCleaningDetailVOS.add(analysisUnqualifiedCleaningDetailVO); |
| | | } |
| | | // 按照数量倒序排序 |
| | | analysisUnqualifiedCleaningDetailVOS.sort(Comparator.comparingInt(AnalysisUnqualifiedCleaningDetailVO::getCount).reversed()); |
| | | analysisUnqualifiedCleaningVO.setAnalysisUnqualifiedCleaningDetailVOS(analysisUnqualifiedCleaningDetailVOS); |
| | | } |
| | | |