From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index 41099ea..4019ca0 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -1,14 +1,14 @@
package com.ruoyi.inspectiontask.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
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;
@@ -30,19 +30,26 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
+ @ApiModelProperty(value = "璁惧id")
+ private Integer taskId;
+
@ApiModelProperty(value = "宸℃浜�")
+ @Excel(name = "鎵ц宸℃浜�")
private String inspectorIds;
@ApiModelProperty(value = "宸℃鍦扮偣")
private String inspectionLocation;
@ApiModelProperty(value = "棰戞")
+ @Excel(name = "棰戞")
private String frequencyType;
@ApiModelProperty(value = "棰戞璇︽儏")
+ @Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
@ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
@@ -55,15 +62,18 @@
private boolean isActive;
@ApiModelProperty(value = "澶囨敞")
+ @Excel(name = "澶囨敞")
private String remarks;
@ApiModelProperty(value = "鐧昏浜篿d")
private Long registrantId;
@ApiModelProperty(value = "鐧昏浜�")
+ @Excel(name = "鐧昏浜�")
private String registrant;
@ApiModelProperty(value = "鐧昏鏃ユ湡")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDate registrationDate;
@ApiModelProperty(value = "鐘舵��")
@@ -72,14 +82,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 = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@@ -92,6 +105,9 @@
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3