无关风月
2025-06-27 ffa2e084864baf6c294204fe1cb0bc23c4304f62
保洁巡检本周代码
3个文件已修改
10 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsChildVO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
            }
        }
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("清洁合格")
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsVO.java
@@ -15,4 +15,5 @@
    private List<ProjectDeptDetailsChildVO> projectChild;
    @ApiModelProperty("项目名称")
    private String projectName;
}