From 083c414ff683ab12e65069c6c0ba6871ed1ed09f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 10:19:09 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 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 34a6869..9b437ee 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;
@@ -9,6 +10,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -34,6 +36,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;
@@ -45,15 +48,22 @@
@ApiModelProperty(value = "点位id")
@TableField("location_id")
private String locationId;
+ @ApiModelProperty(value = "距离 米")
+ @TableField(exist = false)
+ private BigDecimal distance;
@ApiModelProperty(value = "巡检员id 对应sys_user表")
@TableField("patrol_inspector")
private String patrolInspector;
@ApiModelProperty(value = "执行日期")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("implement_time")
private LocalDateTime implementTime;
+
+ @ApiModelProperty(value = "执行日期前端传递")
+ @TableField(exist = false)
+ private String implementTime1;
@ApiModelProperty(value = "任务类型 1日常任务 2自建任务")
@TableField("task_type")
@@ -62,6 +72,19 @@
@ApiModelProperty(value = "巡检员所属部门id")
@TableField("patrol_inspector_dept")
private String patrolInspectorDept;
-
-
+ @ApiModelProperty(value = "任务名称")
+ @TableField("task_name")
+ private String taskName;
+ @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