From fd2de42e8b0019e660f04c72d0a9d218e032f4e4 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期五, 05 七月 2024 13:59:02 +0800 Subject: [PATCH] 添加取水口和更改取水口时判断取水口是否重名 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java index cbd8165..750461f 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeActiveCard.java @@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.dy.common.po.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Positive; +import jakarta.validation.constraints.*; import lombok.*; import org.hibernate.validator.constraints.Length; @@ -35,7 +32,7 @@ @AllArgsConstructor @Schema(name = "寮�鍗�/琛ュ崱瀹炰綋") public class SeActiveCard implements BaseEntity { - public static final long serialVersionUID = 202312071927001L; + public static final long serialVersionUID = 202401151518001L; /** * 涓婚敭 @@ -48,16 +45,30 @@ /** * 姘村崱缂栧彿 */ - @Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖") - private String cardnum; + //@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + //@NotBlank(message = "姘村崱缂栧彿涓嶈兘涓虹┖") + //private String cardnum; /** * 鍐滄埛缂栧彿 */ - @Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖") - private String clientnum; + //@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + //@NotBlank(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖") + //private String clientnum; + + /** + * 姘村崱ID;姘村崱涓婚敭 + */ + @Schema(description = "姘村崱ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @NotNull(message = "姘村崱ID涓嶈兘涓虹┖") + private Long cardid; + + /** + * 鍐滄埛ID;鍐滄埛涓婚敭 + */ + @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @NotNull(message = "鍐滄埛ID涓嶈兘涓虹┖") + private Long clientid; /** * 鍗$墖璐圭敤 @@ -78,7 +89,7 @@ */ @Schema(description = "琛ュ崱閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @Length(message = "琛ュ崱閲戦涓嶅皬浜巤min}", min = 0) - private Double reissueamount; + private Float reissueamount; /** * 鎿嶄綔绫诲瀷;1-寮�鍗★紝2-琛ュ崱 @@ -96,10 +107,10 @@ private String remarks; /** - * 鎿嶄綔浜虹紪鍙� + * 鎿嶄綔浜篒D */ - @Schema(description = "鎿嶄綔浜虹紪鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @Positive(message = "鎿嶄綔浜虹紪鍙峰繀椤讳负澶т簬0鐨勬暣鏁�") + @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�") private Long operator; /** -- Gitblit v1.8.0