From 9364cf6824389a3264dc2cdb2bc3b5857ce76ad5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 23:38:54 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
index 998f30c..5c0dab0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java
@@ -13,6 +13,7 @@
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 +21,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 +73,8 @@
private TDeptService deptService;
@Resource
private ISysUserService sysUserService;
+ @Resource
+ private TokenService tokenService;
@ApiOperation(value = "点位管理分页列表")
@PostMapping(value = "/pageList")
@@ -175,12 +178,70 @@
res.add(temp);
}
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 +275,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;
--
Gitblit v1.7.1