From 720e3c0e119ca062dc69aca47ec6c42254fee75d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 七月 2025 21:17:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java
index 9f795a6..641564a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.model;
+import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
@@ -34,6 +35,7 @@
@TableField("project_id")
private String projectId;
+ @Excel(name = "任务状态", width = 20,orderNum = "8",replace = {"1_未执行","2_超时","3_待确认","4_待整改","5_整改完成","6_已完成"})
@ApiModelProperty(value = "任务状态:1未执行、2超时、3待确认、4待整改、5整改完成、6已完成")
@TableField("status")
private Integer status;
@@ -55,6 +57,10 @@
@TableField("implement_time")
private LocalDateTime implementTime;
+ @ApiModelProperty(value = "执行日期前端传递")
+ @TableField(exist = false)
+ private String implementTime1;
+
@ApiModelProperty(value = "任务类型 1日常任务 2自建任务")
@TableField("task_type")
private Integer taskType;
@@ -68,6 +74,13 @@
@ApiModelProperty(value = "任务编号")
@TableField("task_code")
private String taskCode;
-
-
+ @ApiModelProperty(value = "模板id 日常任务存储")
+ @TableField("template_id")
+ private String templateId;
+ @ApiModelProperty(value = "模板id 日常任务存储")
+ @TableField("user_id")
+ private Long userId;
+ @ApiModelProperty(value = "点位名称")
+ @TableField(exist = false)
+ private String locationName;
}
--
Gitblit v1.7.1