From ffa2e084864baf6c294204fe1cb0bc23c4304f62 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 14:29:05 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsChildVO.java | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java | 6 ++++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java | 1 +
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
index 223bc2e..27943b3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
@@ -74,6 +74,8 @@
private TLeaveService leaveService;
@Resource
private TInspectorService inspectorService;
+ @Resource
+ private TCleanerService cleanerService;
@ApiOperation(value = "任务进度分页列表查询")
@PostMapping(value = "/taskProgress")
@@ -250,6 +252,8 @@
}
for (ProjectDeptDetailsVO re : res) {
for (ProjectDeptDetailsChildVO projectDeptDetailsChildVO : re.getProjectChild()) {
+ int cleanerCount = cleanerService.lambdaQuery().eq(TCleaner::getProjectId, projectDeptDetailsChildVO.getProjectId()).list().size();
+ projectDeptDetailsChildVO.setCleanerCount(cleanerCount);
List<LocationTypeListByProjectVO> locationTypeListByProjectVOS1 = new ArrayList<>();
for (LocationTypeListByProjectVO locationTypeListByProjectVO : locationTypeListByProjectVOS) {
LocationTypeListByProjectVO temp = new LocationTypeListByProjectVO();
@@ -317,6 +321,8 @@
locationTypeListByProjectVOS1.add(temp);
}
projectDeptDetailsChildVO.setLocationTypeList(locationTypeListByProjectVOS1);
+ projectDeptDetailsChildVO.setCleanerCount(0);
+
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsChildVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsChildVO.java
index 40d6f47..37f572e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsChildVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsChildVO.java
@@ -18,7 +18,8 @@
private String projectChildName;
@ApiModelProperty("片区id")
private String projectId;
-
+ @ApiModelProperty("保洁员数量")
+ private Integer cleanerCount;
@ApiModelProperty("总数")
private Integer total;
@ApiModelProperty("清洁合格")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java
index 5b92d2d..d406a10 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java
@@ -15,4 +15,5 @@
private List<ProjectDeptDetailsChildVO> projectChild;
@ApiModelProperty("项目名称")
private String projectName;
+
}
--
Gitblit v1.7.1