From b2e3d6532dbbb3929e01a598dcef7eb07f39b826 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 09:30:27 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLocationController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 94562b9..5b70801 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.*;
@@ -72,6 +73,8 @@
private TDeptService deptService;
@Resource
private ISysUserService sysUserService;
+ @Resource
+ private TokenService tokenService;
@ApiOperation(value = "点位管理分页列表")
@PostMapping(value = "/pageList")
@@ -161,6 +164,9 @@
}
}
});
+ 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();
@@ -175,7 +181,7 @@
res.add(temp);
}
pageInfo.setRecords(res);
- return R.ok();
+ return R.ok(pageInfo);
}
@ApiOperation(value = "根据片区id查询保洁员列表 不分页")
@GetMapping(value = "/listCleaner")
@@ -187,6 +193,7 @@
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() {
@@ -271,6 +278,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