From 6bab142343375e744e46f2042aa3b0fedea70b06 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 19 五月 2026 23:32:55 +0800
Subject: [PATCH] fix: 设备巡检修改

---
 src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 8d03b06..f9898f9 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -4,12 +4,10 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -60,7 +58,7 @@
     private LocalDateTime lastExecutionTime;
 
     @ApiModelProperty(value = "鏄惁婵�娲�")
-    private boolean isActive;
+    private Integer isActive;
 
     @ApiModelProperty(value = "澶囨敞")
     @Excel(name = "澶囨敞")
@@ -83,14 +81,17 @@
     @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
     private Integer deleted;
 
+    @TableField(exist = false)
+    private String dateStr;
+
     @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
     @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
     private Integer createUser;
 
     @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
     @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@@ -105,4 +106,10 @@
     @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
     private Long tenantId;
 
+    @ApiModelProperty(value = "宸℃楠屾敹浜篒D")
+    private Long inspectionAcceptorId;
+
+    @ApiModelProperty(value = "宸℃楠屾敹浜哄鍚�")
+    private String inspectionAcceptor;
+
 }

--
Gitblit v1.9.3