From a1eabf01b3dbec288897d4d1cc400cfdad076d1f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 13:57:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProjectDeptDetailsChildVO.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 37f572e..65f056f 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
@@ -1,5 +1,7 @@
package com.ruoyi.system.vo.system;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
import com.ruoyi.system.model.TProjectDept;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,14 +14,20 @@
@ApiModel(value = "片区VO")
public class ProjectDeptDetailsChildVO {
- @ApiModelProperty("作业类型分类")
- private List<LocationTypeListByProjectVO> locationTypeList;
@ApiModelProperty("片区名称")
+ @Excel(name = "片区名称", width = 20)
private String projectChildName;
+ @ApiModelProperty("保洁员数量")
+ @Excel(name = "巡检保洁员数", width = 20)
+ private Integer cleanerCount;
+ @ApiModelProperty("作业类型分类")
+ @ExcelCollection(name = "作业类型分类")
+ private List<LocationTypeListByProjectVO> locationTypeList;
+ @ApiModelProperty("任务情况汇总")
+ @ExcelCollection(name = "任务情况汇总")
+ private List<TaskSummaryVO> taskSummaryVOS;
@ApiModelProperty("片区id")
private String projectId;
- @ApiModelProperty("保洁员数量")
- private Integer cleanerCount;
@ApiModelProperty("总数")
private Integer total;
@ApiModelProperty("清洁合格")
--
Gitblit v1.7.1