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


@@ -9,6 +9,7 @@


import cn.afterturn.easypoi.excel.entity.TemplateExportParams;


import cn.hutool.core.io.resource.ClassPathResource;


import com.ruoyi.common.core.domain.BaseModel;


import com.ruoyi.common.utils.CodeGenerateUtils;


import com.ruoyi.common.utils.DateUtils;


import com.ruoyi.common.utils.WebUtils;


import com.ruoyi.framework.web.service.TokenService;


@@ -91,18 +92,30 @@


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


        List<TLocation> locationList = locationService.list();


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


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


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


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


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


            for (TProjectDept tProjectDept : list) {


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


                        List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()


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


                        listIds.addAll(collect);


                    listIds.add(tProjectDept.getId());


                }


            }


            List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()


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


            projectIds.addAll(deptIds);


            if (projectIds.isEmpty()){


            listIds.addAll(deptIds);


            if (listIds.isEmpty()){


                return R.ok(new PageInfo<>());


            }


            List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))


                    .map(SysUser::getUserId).collect(Collectors.toList());


            query.setPatrolInspectorIds( collect);


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


                List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->


                        sysUser.getPhonenumber().contains(query.getPhonenumber())


                                && projectIds.contains(sysUser.getDeptId())


                                && listIds.contains(sysUser.getDeptId())


                ).map(SysUser::getUserId).collect(Collectors.toList());


                if (patrolInspectorIds.isEmpty()){


                    return R.ok(new PageInfo<>());


@@ -161,6 +174,9 @@


    @ApiOperation(value = "新增任务")


    @PostMapping(value = "/add")


    public R<Boolean> add(@RequestBody TTaskDTO dto) {


        String nameAndCode = CodeGenerateUtils.generateVolumeSn();


        dto.setTaskName(nameAndCode);


        dto.setTaskCode(nameAndCode);


        dto.setTaskType(2);


        String implementTime1 = dto.getImplementTime1();


        // 转化为LocalDateTime类型


@@ -177,6 +193,7 @@


        dto.setAuditTime(LocalDateTime.now());


        TTask task = taskCleanerService.getById(dto.getTaskId());


        TTaskDetail one = taskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId())


                .eq(TTaskDetail::getHandleType,1)


                .orderByDesc(BaseModel::getCreateTime).last("limit 1").one();


        dto.setClearStatus(one.getClearStatus());


        TLocation location = locationService.getById(task.getLocationId());


@@ -197,20 +214,23 @@


            tNotice.setNoticeContent("【"+location.getLocationName()+"】任务不合格,请重新上传!");




        }else{




            dto.setHandleType(2);


            // 如果是初次审核就通过 将状态设置为已完成


            List<TTaskDetail> list = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, dto.getTaskId()).list();


            if (list.isEmpty()){


            List<TTaskDetail> list = tTaskDetailService.lambdaQuery()


                    .eq(TTaskDetail::getHandleType,1)


                    .eq(TTaskDetail::getTaskId, dto.getTaskId()).list();


                if (list.size()<2){


                    task.setStatus(6);


                    taskCleanerService.updateById(task);


                    tNotice.setNoticeType(2);


                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");


            }else{


                task.setStatus(5);


                taskCleanerService.updateById(task);


                tNotice.setNoticeType(2);


                tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");


            }


                }else{


                    task.setStatus(5);


                    taskCleanerService.updateById(task);


                    tNotice.setNoticeType(2);


                    tNotice.setNoticeContent("【"+location.getLocationName()+"】任务已通过");


                }


        }


        noticeService.save(tNotice);


        dto.setAuditPerson(tokenService.getLoginUser().getUserId()+"");


@@ -225,7 +245,7 @@


    @Log(title = "批量审核任务", businessType = BusinessType.UPDATE)


    @ApiOperation(value = "批量审核任务")


    @PostMapping(value = "/auditBatch")


    public R<Boolean> auditBatch(@RequestBody @Validated TTaskAuditBatchDTO dto) {


    public R<Boolean> auditBatch(@RequestBody  TTaskAuditBatchDTO dto) {


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


        for (String s : dto.getTaskIds().split(",")) {


            TTask byId = taskCleanerService.getById(s);


@@ -267,13 +287,17 @@


        TLocationType byId2 = locationTypeService.getById(byId1.getLocationType());


        taskDetailVO.setLocationAddress(byId1.getLocationAddress());


        taskDetailVO.setLocationIcon(byId2.getLocationIcon());


        taskDetailVO.setLocationName(byId2.getLocationName());


        taskDetailVO.setLocationName(byId1.getLocationName());


        taskDetailVO.setLocationTypeName(byId2.getLocationName());


        TTaskDetail tTaskDetail = list.stream().filter(e -> e.getHandleType() == 1).findFirst().orElse(null);


        if (tTaskDetail!=null &&  tTaskDetail.getUnqualified()!=null){


            TDictData byId3 = dictDataService.getById(tTaskDetail.getUnqualified());


            if (byId3!=null){


                tTaskDetail.setUnqualifiedName(byId3.getDataContent());


            }


        }


        if (tTaskDetail!=null){


            tTaskDetail.setFinishTime(tTaskDetail.getCreateTime());


        }


        taskDetailVO.setTaskDetail(tTaskDetail);


        taskDetailVO.setRecords(list);


@@ -348,43 +372,55 @@


        return R.ok();


    }




    @Log(title = "任务记录导出", businessType = BusinessType.EXPORT)


    @Log(title = "任务记录导出", businessType = BusinessType.OTHER)


    @ApiOperation(value = "任务记录导出")


    @PostMapping(value = "/exportExcel")


    public void exportExcel(@RequestBody TaskListQuery query) {


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


        List<TLocation> locationList = locationService.list();


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


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


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


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


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


            for (TProjectDept tProjectDept : list) {


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


                    List<String> collect = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, tProjectDept.getId()).list()


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


                    listIds.addAll(collect);


                }


            }


            List<String> deptIds = deptService.lambdaQuery().like(TDept::getDeptName, query.getDeptName()).list()


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


            projectIds.addAll(deptIds);


            if (projectIds.isEmpty()){


                projectIds.add("-1");


            listIds.addAll(deptIds);


            if (listIds.isEmpty()){


                listIds.add("0");


            }


            List<Long> collect = sysUsers.stream().filter(e -> listIds.contains(e.getDeptId()))


                    .map(SysUser::getUserId).collect(Collectors.toList());


            query.setPatrolInspectorIds( collect);


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


                List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->


                        sysUser.getPhonenumber().equals(query.getPhonenumber())


                                && projectIds.contains(sysUser.getDeptId())


                        sysUser.getPhonenumber().contains(query.getPhonenumber())


                                && listIds.contains(sysUser.getDeptId())


                ).map(SysUser::getUserId).collect(Collectors.toList());


                if (patrolInspectorIds.isEmpty()){


                    patrolInspectorIds.add(-1L);


                    patrolInspectorIds.add(0L);


                }


                query.setPatrolInspectorIds(patrolInspectorIds);


            }


        }


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


            List<Long> patrolInspectorIds = sysUsers.stream().filter(sysUser ->


                    sysUser.getPhonenumber().equals(query.getPhonenumber())


                    sysUser.getPhonenumber().contains(query.getPhonenumber())


            ).map(SysUser::getUserId).collect(Collectors.toList());


            query.setPatrolInspectorIds(patrolInspectorIds);


            if (!query.getPatrolInspectorIds().isEmpty()){


                // 取交集


                patrolInspectorIds = patrolInspectorIds.stream().filter(query.getPatrolInspectorIds()::contains).collect(Collectors.toList());


            }


            query.setPatrolInspectorIds(patrolInspectorIds);


            if (patrolInspectorIds.isEmpty()){


                patrolInspectorIds.add(-1L);


                patrolInspectorIds.add(0L);


            }


        }


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


@@ -392,26 +428,27 @@


                    .list().stream().distinct().map(TTaskDetail::getTaskId).collect(Collectors.toList());


            query.setTaskIds(collect);


            if (collect.isEmpty()){


                collect.add("-1");


                collect.add("0");


            }


        }


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


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


            List<String> collect = locationList.stream().filter(e -> e.getLocationType().equals(query.getLocationType())).map(TLocation::getId)


                    .collect(Collectors.toList());


            if (collect.isEmpty()){


                collect.add("-1");


                collect.add("0");


            }


            query.setLocationIds(collect);


        }


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


            List<String> collect = locationList.stream().filter(e -> e.getLocationName().contains(query.getLocationName())).map(TLocation::getId)


                    .collect(Collectors.toList());


            query.setLocationIds(collect);


            if (collect.isEmpty()){


                collect.add("-1");


                collect.add("0");


            }else{


                collect = collect.stream().filter(query.getLocationIds()::contains).collect(Collectors.toList());


                if (collect.isEmpty()){


                    collect.add("-1");


                    collect.add("0");


                }


                query.setLocationIds(collect);


            }