From 2129ea1fca4900b7fcf1c32505fd3929f67bee2e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:44:20 +0800
Subject: [PATCH] 修复定时/定量开关阀参数错误
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java | 65 +++++++++++++-------------------
1 files changed, 27 insertions(+), 38 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java
index 697722e..ee6848d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java
@@ -7,31 +7,26 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
import lombok.*;
-import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
- * @author :WuZeYu
- * @Date :2024/8/6 8:47
- * @LastEditTime :2024/8/6 8:47
- * @Description
+ * @author ZhuBaoMin
+ * @date 2024-11-06 11:33
+ * @LastEditTime 2024-11-06 11:33
+ * @Description 宸ュ崟瀹炰綋绫�
*/
-/**
- * 宸ュ崟琛�
- */
-@TableName(value="ope_feedback", autoResultMap = true)
+
+@TableName(value = "ope_work_order", autoResultMap = true)
@Data
-@ToString
@Builder
+@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "宸ュ崟琛�")
public class OpeWorkOrder implements BaseEntity {
+ public static final long serialVersionUID = 202411061136001L;
+
/**
* 涓婚敭
*/
@@ -43,25 +38,23 @@
* 娲惧崟浜篒D
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- @NotNull
- private Long dispatcher;
+ private Long dispatcherId;
/**
* 宸℃鍛業D
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- @NotNull
- private Long inspector;
+ private Long inspectorId;
/**
- * 浠诲姟绫诲瀷;1-婕忔崯澶勭悊锛�2-鎶ヨ澶勭悊锛�3-鍙嶉澶勭悊锛�4-鍏朵粬
+ * 浠诲姟绫诲瀷ID
*/
- private Byte taskType;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long taskTypeId;
/**
* 浠诲姟鍐呭
*/
- @NotBlank
private String taskContent;
/**
@@ -72,38 +65,34 @@
/**
* 瑕佹眰瀹屾垚鏃堕棿;绮剧‘鍒板垎
*/
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date deadLine;
+
+ /**
+ * 浠诲姟瀹屾垚鏃堕棿;绮剧‘鍒板垎
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private Date completeTime;
/**
* 娲惧崟鏃堕棿
*/
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dispatchTime;
/**
- * 澶勭悊缁撴灉;1-瀹屾垚锛�2-鏈畬鎴�
+ * 鐘舵��;1-鏈畬鎴愶紝2-宸插畬鎴�
*/
- private Byte taskResult;
+ private Byte state;
/**
- * 缁撴灉鐓х墖
+ * 椹冲洖娆℃暟
*/
- private String photos;
-
- /**
- * 瀹屽伐鏃堕棿
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date completeTime;
+ private Integer rejectTimes;
/**
* 閫昏緫鍒犻櫎鏍囪瘑;鏈垹闄や负0锛屽凡鍒犻櫎涓哄垹闄ゆ椂闂�
*/
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long deleted;
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0