From 2fee40486f9473398be3c293e8311d45bd53adc9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 20:47:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProgressListVO.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProgressListVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProgressListVO.java
index d45af85..ab24c49 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProgressListVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/ProgressListVO.java
@@ -1,17 +1,23 @@
package com.ruoyi.system.vo.system;
import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.model.TTask;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@ApiModel(value = "任务进度列表分页VO")
-public class ProgressListVO extends TTask {
+public class ProgressListVO implements Serializable {
@Excel(name = "姓名", width = 20,orderNum = "1")
@ApiModelProperty(value = "姓名")
@@ -44,4 +50,44 @@
@ApiModelProperty(value = "计划请假天数")
private Long num5;
+ private String id;
+
+ @ApiModelProperty(value = "项目部/片区id")
+ private String projectId;
+
+ @ApiModelProperty(value = "任务状态:1未执行、2超时、3待确认、4待整改、5整改完成、6已完成")
+ private Integer status;
+
+ @ApiModelProperty(value = "保洁员id")
+ private String cleanerId;
+
+ @ApiModelProperty(value = "点位id")
+ private String locationId;
+
+ @ApiModelProperty(value = "巡检员id 对应sys_user表")
+ private String patrolInspector;
+
+ @ApiModelProperty(value = "执行日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime implementTime;
+
+ @ApiModelProperty(value = "执行日期前端传递")
+ private String implementTime1;
+
+ @ApiModelProperty(value = "任务类型 1日常任务 2自建任务")
+ private Integer taskType;
+
+ @ApiModelProperty(value = "巡检员所属部门id")
+ private String patrolInspectorDept;
+ @ApiModelProperty(value = "任务名称")
+ private String taskName;
+ @ApiModelProperty(value = "任务编号")
+ private String taskCode;
+ @ApiModelProperty(value = "模板id 日常任务存储")
+ private String templateId;
+ @ApiModelProperty(value = "模板id 日常任务存储")
+ private Long userId;
+ @ApiModelProperty(value = "点位名称")
+ private String locationName;
+
}
--
Gitblit v1.7.1