From 5e75ef24e5dd45ae934dc7f03f6c7736ca73c9ff Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 15:01:32 +0800
Subject: [PATCH] fix order search
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
index 81f9282..15e35ce 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrOrder.java
@@ -2,15 +2,18 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import java.util.Date;
+import java.util.List;
/**
*
@@ -25,19 +28,24 @@
public class PrOrder implements BaseEntity {
/**
- *
+ * 涓婚敭
*/
- @NotNull(message="涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(value = "id", type = IdType.INPUT)
public Long id;
/**
* 鍚嶇О
*/
+ @NotEmpty(message = "鍚嶇О涓嶈兘涓虹┖")
public String name;
/**
* 瀹㈡埛鍚嶇О
*/
public String customerName;
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ public String projectName;
/**
* 璁㈠崟璐熻矗浜�
*/
@@ -55,9 +63,10 @@
*/
public Integer status;
/**
- * 鍒涘缓浜�
- */
- public String creator;
+ * 鍒涘缓浜�
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long creator;
/**
* 鍒涘缓鏃堕棿
*/
@@ -65,11 +74,14 @@
/**
* 鏄惁鍒犻櫎锛�1鏄紝0鍚�
*/
- public Integer deleted;
+ @JSONField(serialize = false)
+ public Boolean deleted;
/**
* 澶囨敞
*/
public String remark;
+ @NotNull(message = "璁㈠崟椤逛笉鑳戒负绌�")
+ public List<PrOrderItem> items;
}
--
Gitblit v1.8.0