From 1510366fa12fafd5197ebcd8d7fbc45d2383218d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 15:49:27 +0800
Subject: [PATCH] 设备管理优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
index 897633e..929293c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
@@ -16,13 +16,8 @@
*/
package org.sxkj.gd.workorder.vo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
import java.util.Date;
/**
@@ -95,6 +90,13 @@
*/
@ApiModelProperty(value = "状态：0待签收、1拒绝签收、2已撤回、3待审核、4审核驳回、5审核通过、6待验收、7拒绝验收、8验收通过")
private String taskStatus;
+
+ /**
+ * 拒绝原因（审核拒绝时必填）
+ */
+ @ApiModelProperty(value = "拒绝原因（审核拒绝时必填）")
+ private String rejectReason;
+
/**
* 区域编码
*/
@@ -104,32 +106,25 @@
@ApiModelProperty("主键id")
private Long id;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建人")
+ @ApiModelProperty(value = "创建人")
private Long createUser;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("创建部门")
+ @ApiModelProperty(value = "创建部门")
private Long createDept;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value = "创建时间")
private Date createTime;
- @JsonSerialize(using = ToStringSerializer.class)
- @ApiModelProperty("更新人")
+ @ApiModelProperty(value = "更新人")
private Long updateUser;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("更新时间")
+ @ApiModelProperty(value = "更新时间")
private Date updateTime;
- @ApiModelProperty("业务状态")
+ @ApiModelProperty(value = "状态")
private Integer status;
- @ApiModelProperty("是否已删除")
+ @ApiModelProperty(value = "逻辑删除")
private Integer isDeleted;
}
--
Gitblit v1.9.3