From bc3fe7ea8eecca4d36793b80bfbe2e212cde5b4f Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 02 七月 2024 10:41:48 +0800
Subject: [PATCH] 修改测试库地址;pom文件打包时的依赖
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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 167b071..659f77c 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.*;
@@ -46,25 +45,31 @@
/**
* 鑺傜偣浣滀笟鍐呭
*/
- @NotEmpty(message = "鑺傜偣浣滀笟鍐呭涓嶈兘涓虹┖")
+ @NotEmpty(message = "璇疯緭鍏ヨ妭鐐逛綔涓氬唴瀹�")
public String content;
+
+ /**
+ * 鎺掑簭
+ */
+ //@NotNull(message = "鑺傜偣绫诲瀷涓嶈兘涓虹┖")
+ public Integer nodeType;
/**
* 鏄惁寮�濮嬭妭鐐癸紝1鏄紝0鍚�
*/
- @NotNull(message = "鏄惁寮�濮嬭妭鐐逛笉鑳戒负绌�")
+ @NotNull(message = "璇烽�夋嫨鏄惁鐢熶骇寮�濮�")
public Boolean isStart;
/**
* 鏄惁缁撴潫鑺傜偣锛�1鏄紝0鍚�
*/
- @NotNull(message = "鏄惁缁撴潫鑺傜偣涓嶈兘涓虹┖")
+ @NotNull(message = "璇烽�夋嫨鏄惁鐢熶骇缁撴潫")
public Boolean isEnd;
/**
* 鏄惁璁板綍璁惧鍛ㄦ湡锛�1鏄紝0鍚�
*/
- @NotNull(message = "鏄惁璁板綍璁惧鍛ㄦ湡涓嶈兘涓虹┖")
+ @NotNull(message = "璇烽�夋嫨鏄惁璁板綍璁惧鍛ㄦ湡")
public Boolean isRecord;
/**
@@ -72,6 +77,11 @@
*/
public String equipCycleContent;
+ @AssertTrue(message = "璇疯緭鍏ヨ褰曡澶囧懆鏈熷唴瀹�")
+ public boolean isEquipCycleContentValid() {
+ return !isRecord || (isRecord && StringUtils.isNotBlank(equipCycleContent));
+ }
+
/**
* 鏄惁鍒犻櫎锛�1鏄紝0鍚�
*/
--
Gitblit v1.8.0