From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTaskDetail.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTaskDetail.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTaskDetail.java
index cb60407..ae180eb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTaskDetail.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTaskDetail.java
@@ -8,6 +8,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -32,6 +33,7 @@
@ApiModelProperty(value = "任务id")
@TableField("task_id")
+ @NotBlank(message = "任务id不能为空")
private String taskId;
@ApiModelProperty(value = "清洁情况 1合格2不合格")
@@ -41,6 +43,12 @@
@ApiModelProperty(value = "不合格原因id")
@TableField("unqualified")
private String unqualified;
+ @ApiModelProperty(value = "不合格原因名称")
+ @TableField(exist = false)
+ private String unqualifiedName;
+ @ApiModelProperty(value = "申诉记录id handleType=4 5 6 返回")
+ @TableField("appeal_id")
+ private String appealId;
@ApiModelProperty(value = "备注")
@TableField("remark")
@@ -57,14 +65,22 @@
@ApiModelProperty(value = "审核人id")
@TableField("audit_person")
private String auditPerson;
+ @ApiModelProperty(value = "审核人名称")
+ @TableField(exist = false)
+ private String auditPersonName;
@ApiModelProperty(value = "审核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("audit_time")
private LocalDateTime auditTime;
+ @ApiModelProperty(value = "完成时间")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime finishTime;
@ApiModelProperty(value = "审核状态1通过2驳回")
@TableField("audit_status")
+ @NotBlank(message = "审核状态不能为空")
private Integer auditStatus;
@ApiModelProperty(value = "审核备注")
--
Gitblit v1.7.1