From 2b382a92207dfabf0eb30e743265df5c7c50e7bc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:27:45 +0800
Subject: [PATCH] feat(approve): 新增办公用品审批功能
---
src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 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..2d8722e 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -1,14 +1,13 @@
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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -18,7 +17,7 @@
* @date : 2025/9/19 10:27
*/
@Data
-@ApiModel
+@Schema
@TableName("timing_task")
public class TimingTask {
@@ -30,68 +29,84 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
+ @Excel(name = "宸℃浠诲姟鍚嶇О")
private String taskName;
- @ApiModelProperty(value = "宸℃浜�")
+ @Schema(description = "璁惧id")
+ private Integer taskId;
+
+ @Schema(description = "宸℃浜�")
+ @Excel(name = "鎵ц宸℃浜�")
private String inspectorIds;
- @ApiModelProperty(value = "宸℃鍦扮偣")
+ @Schema(description = "宸℃鍦扮偣")
private String inspectionLocation;
- @ApiModelProperty(value = "棰戞")
+ @Schema(description = "棰戞")
+ @Excel(name = "棰戞")
private String frequencyType;
- @ApiModelProperty(value = "棰戞璇︽儏")
+ @Schema(description = "棰戞璇︽儏")
+ @Excel(name = "寮�濮嬫棩鏈熶笌鏃堕棿")
private String frequencyDetail;
- @ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
+ @Schema(description = "涓嬫鎵ц鏃堕棿")
private LocalDateTime nextExecutionTime;
- @ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
+ @Schema(description = "鏈�鍚庢墽琛屾椂闂�")
private LocalDateTime lastExecutionTime;
- @ApiModelProperty(value = "鏄惁婵�娲�")
+ @Schema(description = "鏄惁婵�娲�")
private boolean isActive;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
+ @Excel(name = "澶囨敞")
private String remarks;
- @ApiModelProperty(value = "鐧昏浜篿d")
+ @Schema(description = "鐧昏浜篿d")
private Long registrantId;
- @ApiModelProperty(value = "鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
+ @Excel(name = "鐧昏浜�")
private String registrant;
- @ApiModelProperty(value = "鐧昏鏃ユ湡")
+ @Schema(description = "鐧昏鏃ユ湡")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDate registrationDate;
- @ApiModelProperty(value = "鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
+ @Schema(description = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
- @ApiModelProperty(value = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
+ @TableField(exist = false)
+ private String dateStr;
+
+ @Schema(description = "鍒涘缓璇ヨ褰曠殑鐢ㄦ埛")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璁板綍鍒涘缓鏃堕棿")
+ @Schema(description = "璁板綍鍒涘缓鏃堕棿")
@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 = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
+ @Schema(description = "鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "璁板綍鏈�鍚庢洿鏂版椂闂�")
+ @Schema(description = "璁板綍鏈�鍚庢洿鏂版椂闂�")
@TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛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