bug修改

xuhy

1 天以前 50d0a02f147f44a55c3372465243df1ae1803b0b

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java

@@ -5,14 +5,18 @@
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;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.LocationDTO;
import com.ruoyi.system.importExcel.TLocationImportExcel;
import com.ruoyi.system.model.*;
@@ -20,8 +24,8 @@
import com.ruoyi.system.query.LocationListTaskQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.utils.CustomerImportFailedData;
import com.ruoyi.system.vo.system.LocationListTaskVO;
import com.ruoyi.system.vo.system.LocationListVO;
import com.ruoyi.system.vo.system.*;
import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -72,6 +76,8 @@
    private TDeptService deptService;
    @Resource
    private ISysUserService sysUserService;
    @Resource
    private TokenService tokenService;

    @ApiOperation(value = "点位管理分页列表")
    @PostMapping(value = "/pageList")
@@ -130,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);
@@ -161,26 +180,95 @@
                            }
                        }
                });
                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")
    public R<List<TCleaner>> listCleaner(@RequestParam String id) {
        return R.ok(cleanerService.lambdaQuery().eq(TCleaner::getProjectId,id).list());
    }
    @ApiOperation(value = "根据保洁员id查询点位列表 不分页")
    @GetMapping(value = "/listLocation")
    public R<List<TLocation>> listLocation(@RequestParam String id) {
        return R.ok(locationService.lambdaQuery().eq(TLocation::getLocationCleaner,id).list());
    }

    @ApiOperation(value = "查询部门 项目部列表 不分页")
    @GetMapping(value = "/listDepts")
    public R<List<DeptNoLimitVO>> listDepts() {
        List<TProjectDept> parent = projectDeptService.lambdaQuery().eq(TProjectDept::getParentId, "0").list();
        List<TProjectDept> child = projectDeptService.lambdaQuery().ne(TProjectDept::getParentId, "0").list();
        List<TDept> depts = deptService.list();
        List<DeptNoLimitVO> res = new ArrayList<>();
        DeptNoLimitVO deptNoLimitVO1 = new DeptNoLimitVO();
        deptNoLimitVO1.setDeptName("项目部");
        DeptNoLimitVO deptNoLimitVO2 = new DeptNoLimitVO();
        deptNoLimitVO2.setDeptName("公司");
        res.add(deptNoLimitVO1);
        res.add(deptNoLimitVO2);
        for (DeptNoLimitVO re : res) {
            if (re.getDeptName().equals("项目部")){
                List<DeptNoLimitParentVO> deptNoLimitVOS = new ArrayList<>();
                for (TProjectDept tProjectDept : parent) {
                    DeptNoLimitParentVO deptNoLimitVO = new DeptNoLimitParentVO();
                    deptNoLimitVO.setDeptName(tProjectDept.getProjectName());
                    deptNoLimitVO.setDeptId(tProjectDept.getId());
                    List<TProjectDept> collect = child.stream().filter(e -> e.getParentId().equals(tProjectDept.getId())).collect(Collectors.toList());
                    List<DeptNoLimitChildVO> deptNoLimitChildVOS = new ArrayList<>();
                    for (TProjectDept projectDept : collect) {
                        DeptNoLimitChildVO deptNoLimitChildVO = new DeptNoLimitChildVO();
                        deptNoLimitChildVO.setDeptName(projectDept.getProjectName());
                        deptNoLimitChildVO.setDeptId(projectDept.getId());
                        deptNoLimitChildVOS.add(deptNoLimitChildVO);
                    }
                    deptNoLimitVO.setDeptChild(deptNoLimitChildVOS);
                    deptNoLimitVOS.add(deptNoLimitVO);
                }
                re.setDeptChild(deptNoLimitVOS);
            }else {
                List<DeptNoLimitParentVO> deptNoLimitVOS = new ArrayList<>();
                for (TDept tDept : depts) {
                    DeptNoLimitParentVO deptNoLimitVO = new DeptNoLimitParentVO();
                    deptNoLimitVO.setDeptName(tDept.getDeptName());
                    deptNoLimitVO.setDeptId(tDept.getId());
                    deptNoLimitVOS.add(deptNoLimitVO);
                }
                re.setDeptChild(deptNoLimitVOS);
            }

        }
        return R.ok(res);
    }
    @ApiOperation(value = "根据部门/项目部id查询巡检员列表 不分页")
    @GetMapping(value = "/listUsers")
    public R<List<SysUser>> listUsers(@RequestParam String id) {
            List<SysUser> res = sysUserService.selectUserByDeptId(id);
        return R.ok(res);
    }
    @Log(title = "新增点位", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增点位")
@@ -214,6 +302,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;