From 2c5f5e7091330a748257baab82e81038a0d22816 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 26 十二月 2024 10:25:30 +0800
Subject: [PATCH] JWT have some error
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
index 183d2a4..497b981 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
@@ -1,14 +1,13 @@
package com.dy.pmsGlobal.pojoPr;
+import com.alibaba.excel.util.StringUtils;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import com.dy.common.po.BaseEntity;
+import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.*;
@@ -50,6 +49,12 @@
public String content;
/**
+ * 鎺掑簭
+ */
+ //@NotNull(message = "鑺傜偣绫诲瀷涓嶈兘涓虹┖")
+ public Integer nodeType;
+
+ /**
* 鏄惁寮�濮嬭妭鐐癸紝1鏄紝0鍚�
*/
@NotNull(message = "璇烽�夋嫨鏄惁鐢熶骇寮�濮�")
@@ -70,7 +75,12 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
+
+ @AssertTrue(message = "璇疯緭鍏ヨ褰曡澶囧懆鏈熷唴瀹�")
+ public boolean isDeviceCycleContentValid() {
+ return !isRecord || (isRecord && StringUtils.isNotBlank(deviceCycleContent));
+ }
/**
* 鏄惁鍒犻櫎锛�1鏄紝0鍚�
@@ -84,5 +94,7 @@
@TableField(exist = false)
public PrWorkingInstruction instruction;
+ @TableField(exist = false)
+ public PrBillOfMaterial bill;
}
\ No newline at end of file
--
Gitblit v1.8.0