From 3f00a9c7853c2c3f53c69c3bb4b689b60184dfc4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 22:07:02 +0800
Subject: [PATCH] 1、VO、PO等值对象中凡时Double或Float类型的属性，都加上注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )； 2、工作报中数据查询SQL中增加clientAddr农户地址字段。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java | 182 ++++++++++++++++++--------------------------
1 files changed, 75 insertions(+), 107 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
index f204414..b65d57b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeRecharge.java
@@ -1,15 +1,23 @@
package com.dy.pipIrrGlobal.pojoSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+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;
import java.util.Date;
/**
- * 姘村崱鍏呭�艰〃;
- */
+ * 姘村崱鍏呭�艰〃;
+ */
@TableName(value="se_recharge", autoResultMap = true)
@Data
@@ -20,140 +28,100 @@
@Schema(name = "姘村崱鍏呭�煎疄浣�")
public class SeRecharge implements BaseEntity {
- public static final long serialVersionUID = 20231191728001L;
+ public static final long serialVersionUID = 202401151519001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long id;
/**
- * 姘村崱缂栧彿
- */
+ * 姘村崱ID
+ */
+ @Schema(description = "姘村崱ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ //@NotBlank(message = "姘村崱ID涓嶈兘涓虹┖")
+ //private String cardnum;
+ @NotNull(message = "姘村崱ID涓嶈兘涓虹┖")
private Long cardid;
/**
- * 鍗＄墖浣欓
- */
- private Double money;
+ * 鍐滄埛ID
+ */
+ @Schema(description = "鍐滄埛ID", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ //@NotBlank(message = "鍐滄埛ID涓嶈兘涓虹┖")
+ //private String clientnum;
+ @NotNull(message = "鍐滄埛ID涓嶈兘涓虹┖")
+ private Long clientid;
/**
- * 鍏呭�奸噾棰�
- */
- private Double amount;
+ * 鍗＄墖浣欓
+ */
+ @Schema(description = "鍗＄墖浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鍗＄墖浣欓涓嶈兘涓虹┖")
+ @Length(message = "鍗＄墖浣欓涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float money;
/**
- * 璧犻�侀噾棰�
- */
- private Double gift;
+ * 鍏呭�奸噾棰�
+ */
+ @Schema(description = "鍏呭�奸噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鍏呭�奸噾棰濅笉鑳戒负绌�")
+ @Length(message = "鍏呭�奸噾棰濅笉灏忎簬{min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float amount;
/**
- * 鍏呭�煎悗浣欓
- */
- private Double afterrecharge;
+ * 璧犻�侀噾棰�
+ */
+ @Schema(description = "璧犻�侀噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "璧犻�侀噾棰濅笉灏忎簬{min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float gift;
/**
- * 浠樻鏂瑰紡缂栧彿
- */
+ * 鍏呭�煎悗浣欓
+ */
+ @Schema(description = "鍏呭�煎悗浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "鍏呭�煎悗浣欓涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float afterrecharge;
+
+ /**
+ * 浠樻鏂瑰紡缂栧彿
+ */
+ @Schema(description = "浠樻鏂瑰紡缂栧彿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "浠樻鏂瑰紡缂栧彿涓嶅ぇ浜巤max}锛屼笉灏忎簬{min}", min = 1, max = 4)
private Long paymentid;
/**
* 姘翠环
*/
+ @Schema(description = "姘翠环", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "姘翠环涓嶅皬浜巤min}", min = 0)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float price;
/**
- * 澶囨敞淇℃伅
- */
+ * 澶囨敞淇℃伅
+ */
+ @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "澶囨敞闀垮害灏忎簬{max}瀛�", min = 1, max = 200)
private String remarks;
/**
- * 鎿嶄綔浜虹紪鍙�
- */
+ * 鎿嶄綔浜篒D
+ */
+ @Schema(description = "鎿嶄綔浜篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鎿嶄綔浜篒D蹇呴』涓哄ぇ浜�0鐨勬暣鏁�")
private Long operator;
/**
- * 鎿嶄綔鏃堕棿
- */
+ * 鎿嶄綔鏃堕棿
+ */
+ @Schema(description = "鎿嶄綔鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Date operatedt;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getCardid() {
- return cardid;
- }
-
- public void setCardid(Long cardid) {
- this.cardid = cardid;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Double getAmount() {
- return amount;
- }
-
- public void setAmount(Double amount) {
- this.amount = amount;
- }
-
- public Double getGift() {
- return gift;
- }
-
- public void setGift(Double gift) {
- this.gift = gift;
- }
-
- public Double getAfterrecharge() {
- return afterrecharge;
- }
-
- public void setAfterrecharge(Double afterrecharge) {
- this.afterrecharge = afterrecharge;
- }
-
- public Long getPaymentid() {
- return paymentid;
- }
-
- public void setPaymentid(Long paymentid) {
- this.paymentid = paymentid;
- }
-
- public String getRemarks() {
- return remarks;
- }
-
- public void setRemarks(String remarks) {
- this.remarks = remarks;
- }
-
- public Long getOperator() {
- return operator;
- }
-
- public void setOperator(Long operator) {
- this.operator = operator;
- }
-
- public Date getOperatedt() {
- return operatedt;
- }
-
- public void setOperatedt(Date operatedt) {
- this.operatedt = operatedt;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0