保洁巡检
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
19 小时以前 25b19e60e004290531f61fdf608d1adb5e531903 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java


@@ -5,8 +5,11 @@


import cn.afterturn.easypoi.excel.ExcelImportUtil;


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


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


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.ruoyi.common.annotation.Log;


import com.ruoyi.common.basic.PageInfo;


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


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


import com.ruoyi.common.core.domain.entity.SysUser;


import com.ruoyi.common.core.exception.ServiceException;


@@ -133,10 +136,23 @@


                .eq(query.getStatus() != null, TTask::getStatus, query.getStatus())


                .in(query.getPatrolInspectorIds() != null && query.getPatrolInspectorIds().isEmpty(), TTask::getPatrolInspector, query.getPatrolInspectorIds())


                .in(query.getTaskIds() != null && query.getTaskIds().isEmpty(), TTask::getId, query.getTaskIds()).list();


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




        list = list.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());


        pageInfo.setTotal(list.size());


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


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


                        .in(TTaskDetail::getTaskId,collect)


                .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());


        for (TTask tTask : list) {


            LocationListTaskVO temp = new LocationListTaskVO();


            TLocation tLocation = locationList.stream().filter(e -> e.getId().equals(tTask.getLocationId())).findFirst().orElse(null);


@@ -164,21 +180,32 @@


                            }


                        }


                });


                locationTypeList.stream().filter(e -> e.getId().equals(tLocation.getLocationType())).findFirst()


                        .ifPresent(tLocationType -> temp.setLocationTypeName(tLocationType.getLocationName()));




            }


            TTaskDetail one = tTaskDetailService.lambdaQuery().eq(TTaskDetail::getTaskId, tTask.getId())


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


            if (one!=null){


                temp.setClearStatus(one.getClearStatus());


                temp.setPicture(one.getPicture());


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


            if (tTaskDetail!=null){


                temp.setPicture(tTaskDetail.getPicture());


                temp.setClearStatus(tTaskDetail.getClearStatus());


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


                    if (query.getClearStatus().equals(tTaskDetail.getClearStatus())){


                        res.add(temp);


                    }


                }else{


                    res.add(temp);


                }


            }


            temp.setTaskType(tTask.getTaskType());


            temp.setStatus(tTask.getStatus());


            temp.setTaskId(tTask.getId());


            temp.setImplementTime(tTask.getImplementTime());


            res.add(temp);




        }


        res = res.stream().skip((long) (query.getPageNum() - 1) * query.getPageSize()).limit(query.getPageSize()).collect(Collectors.toList());


        pageInfo.setTotal(res.size());


        pageInfo.setRecords(res);


        return R.ok();


        return R.ok(pageInfo);


    }


    @ApiOperation(value = "根据片区id查询保洁员列表 不分页")


    @GetMapping(value = "/listCleaner")


@@ -240,7 +267,15 @@


    @ApiOperation(value = "根据部门/项目部id查询巡检员列表 不分页")


    @GetMapping(value = "/listUsers")


    public R<List<SysUser>> listUsers(@RequestParam String id) {


            List<SysUser> res = sysUserService.selectUserByDeptId(id);


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


        strings.add(id);


        TProjectDept projectDept = projectDeptService.getById(id);


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


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


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


            strings.addAll(collect);


        }


        List<SysUser> res = sysUserService.selectUserByDeptId(strings);


        return R.ok(res);


    }


    @Log(title = "新增点位", businessType = BusinessType.INSERT)


@@ -275,6 +310,8 @@


    @GetMapping("/import-template")


    public void importTemplate() {


        List<TLocationImportExcel> locationImportExcels = new ArrayList<>();


        TLocationImportExcel tLocationImportExcel = new TLocationImportExcel();


        locationImportExcels.add(tLocationImportExcel);


        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TLocationImportExcel.class, locationImportExcels);


        HttpServletResponse response = WebUtils.response();


        ServletOutputStream outputStream = null;