From 9b1ded672b5819c3a4a46fa7d253811bf241a6ef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 17:28:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsChildVO.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
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 65f056f..1fb7d3a 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
@@ -15,34 +15,42 @@
public class ProjectDeptDetailsChildVO {
@ApiModelProperty("片区名称")
- @Excel(name = "片区名称", width = 20)
+ @Excel(name = "片区名称", width = 20,needMerge = true)
private String projectChildName;
@ApiModelProperty("保洁员数量")
- @Excel(name = "巡检保洁员数", width = 20)
+ @Excel(name = "巡检保洁员数", width = 20,needMerge = true)
private Integer cleanerCount;
- @ApiModelProperty("作业类型分类")
- @ExcelCollection(name = "作业类型分类")
- private List<LocationTypeListByProjectVO> locationTypeList;
- @ApiModelProperty("任务情况汇总")
- @ExcelCollection(name = "任务情况汇总")
- private List<TaskSummaryVO> taskSummaryVOS;
@ApiModelProperty("片区id")
private String projectId;
@ApiModelProperty("总数")
+ @Excel(name = "总数", width = 20,needMerge = true)
private Integer total;
@ApiModelProperty("清洁合格")
+ @Excel(name = "清洁合格", width = 20,needMerge = true)
private Integer num1;
@ApiModelProperty("清洁不合格")
+ @Excel(name = "清洁不合格", width = 20,needMerge = true)
private Integer num2;
@ApiModelProperty("未执行任务")
+ @Excel(name = "未执行任务", width = 20,needMerge = true)
private Integer num3;
@ApiModelProperty("待整改任务")
+ @Excel(name = "待整改任务", width = 20,needMerge = true)
private Integer num4;
@ApiModelProperty("审核通过任务")
+ @Excel(name = "审核通过任务", width = 20,needMerge = true)
private Integer num5;
@ApiModelProperty("超时未执行任务")
+ @Excel(name = "超时未执行任务", width = 20,needMerge = true)
private Integer num6;
@ApiModelProperty("整改完成任务")
+ @Excel(name = "整改完成任务", width = 20,needMerge = true)
private Integer num7;
+ @ApiModelProperty("任务情况汇总")
+// @ExcelCollection(name = "任务情况汇总")
+ private List<TaskSummaryVO> taskSummaryVOS;
+ @ApiModelProperty("作业类型分类")
+ @ExcelCollection(name = "作业类型分类")
+ private List<LocationTypeListByProjectVO> locationTypeList;
}
--
Gitblit v1.7.1