From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:27:35 +0800
Subject: [PATCH] 优化虚拟卡占用逻辑，占用时写入取水口编号，解除占用时清空虚拟卡编号；工单使用的4个表
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
index 3a900b1..88e308d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeCancel.java
@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -32,7 +34,7 @@
@AllArgsConstructor
@Schema(name = "姘村崱娉ㄩ攢瀹炰綋")
public class SeCancel implements BaseEntity {
- public static final long serialVersionUID = 1L;
+ public static final long serialVersionUID = 202401151518002L;
/**
* 涓婚敭
*/
@@ -46,14 +48,14 @@
* 姘村崱缂栧彿
*/
@Schema(description = "姘村崱缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Positive(message = "姘村崱缂栧彿蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
+ @NotNull(message = "姘村崱缂栧彿涓嶈兘涓虹┖")
private Long cardid;
/**
* 鍐滄埛缂栧彿
*/
@Schema(description = "鍐滄埛缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "鍐滄埛缂栧彿涓嶅皬浜巤min}", min = 1)
+ @NotNull(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖")
private Long clientid;
/**
@@ -61,6 +63,7 @@
*/
@Schema(description = "閫�娆鹃噾棰�", requiredMode = Schema.RequiredMode.REQUIRED)
@Length(message = "閫�娆鹃噾棰濅笉灏忎簬{min}瀛�", min = 1)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float refund;
/**
@@ -78,10 +81,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