From ec8f519a552206a22806aabdd36a102def1d35f9 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 23 七月 2024 09:19:00 +0800
Subject: [PATCH] id生成,sql优化
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
index 14bcea8..4548886 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
@@ -2,8 +2,6 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.dy.common.webUtil.QueryConditionVo;
import jakarta.validation.constraints.NotNull;
import lombok.*;
@@ -17,7 +15,7 @@
@Builder
public class QueryVo {
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long id;
+ public Long workId;
/**
* 鐢ㄦ埛瀹炰綋缂栧彿
*/
@@ -32,26 +30,29 @@
* 宸ョ珯瀹炰綋缂栧彿
*/
@NotNull(message="[宸ョ珯瀹炰綋缂栧彿]涓嶈兘涓虹┖")
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long stationId;
+ public String stationId;
/**
* 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
*/
- @NotNull(message="[缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+ //@NotNull(message="[缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long planId;
/**
* 鐢熶骇娴佺▼瀹炰綋缂栧彿
*/
- @NotNull(message="[鐢熶骇娴佺▼瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+ //@NotNull(message="[鐢熶骇娴佺▼瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long processId;
/**
* 鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿
*/
- @NotNull(message="[鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿]涓嶈兘涓虹┖")
+ //@NotNull(message="[鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long nodeId;
+
+ //@NotNull(message="[鐢熶骇娴佺▼鑺傜偣绫诲瀷]涓嶈兘涓虹┖")
+ @NotNull(message="[宸ヤ綔鑱岃矗]涓嶈兘涓虹┖")
+ public Integer workType;
/**
* 浠诲姟璁ら鏃堕棿
*/
@@ -72,15 +73,4 @@
* 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
*/
public String assistants;
-
-
-
-
-
-
-
-
-
-
-
}
--
Gitblit v1.8.0