From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java | 123 ++++++++++++++++++++++++++++++-----------
1 files changed, 90 insertions(+), 33 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
index becefee..117d665 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
@@ -1,7 +1,10 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -12,72 +15,126 @@
* @author ZhuBaoMin
* @date 2023/12/22 11:43
* @LastEditTime 2023/12/22 11:43
- * @Description
+ * @Description 鍐滄埛瑙嗗浘瀵硅薄
*/
@Data
-@Schema(title = "鍐滄埛瑙嗗浘瀵硅薄")
+@JsonPropertyOrder({"countyId","countryName","townId","townName","villageId","villageName","blockId","blockName","divideId","divideName","typeId","waterTypeName","clientId","name","clientNum","phone","idCard","area","cardCount","address","remarks","operateDt"})
public class VoClient implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202410282047001L;
- @Schema(title = "ID")
- private Long id;
- @Schema(title = "鍘縄D")
- private String countyId;
- @Schema(title = "鍘垮悕绉�")
+ /**
+ * 鍘縄D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long countyId;
+
+ /**
+ * 鍘垮悕绉�
+ */
private String countryName;
- @Schema(title = "闀嘔D")
- private String townId;
- @Schema(title = "闀囧悕绉�")
+ /**
+ * 闀嘔D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long townId;
+
+ /**
+ * 闀囧悕绉�
+ */
private String townName;
- @Schema(title = "鏉慖D")
- private String villageId;
- @Schema(title = "鏉戝悕绉�")
+ /**
+ * 鏉慖D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long villageId;
+
+ /**
+ * 鏉戝悕绉�
+ */
private String villageName;
- @Schema(title = "鐗囧尯ID")
- private String blockId;
- @Schema(title = "鐗囧尯鍚嶇О")
+ /**
+ * 鐗囧尯ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long blockId;
+
+ /**
+ * 鐗囧尯鍚嶇О
+ */
private String blockName;
- @Schema(title = "鍒嗘按鎴縄D")
- private String divideId;
- @Schema(title = "鍒嗘按鎴垮悕绉�")
+ /**
+ * 鍒嗘按鎴縄D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long divideId;
+
+ /**
+ * 鍒嗘按鎴垮悕绉�
+ */
private String divideName;
- @Schema(title = "鐢ㄦ埛绫诲瀷ID")
- private String waterTypeId;
- @Schema(title = "鐢ㄦ埛绫诲瀷鍚嶇О")
+ /**
+ * 鐢ㄦ埛绫诲瀷ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long typeId;
+
+ /**
+ * 鐢ㄦ埛绫诲瀷鍚嶇О
+ */
private String waterTypeName;
- @Schema(title = "鍐滄埛ID")
- private String clientId;
+ /**
+ * 鍐滄埛ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long clientId;
- @Schema(title = "鍐滄埛濮撳悕")
+ /**
+ * 鍐滄埛濮撳悕
+ */
private String name;
- @Schema(title = "鍐滄埛缂栧彿")
+ /**
+ * 鍐滄埛缂栧彿
+ */
private String clientNum;
- @Schema(title = "鎵嬫満鍙�")
+ /**
+ * 鎵嬫満鍙�
+ */
private String phone;
- @Schema(title = "韬唤璇佸彿")
+ /**
+ * 韬唤璇佸彿
+ */
private String idCard;
- @Schema(title = "绉嶆闈㈢Н")
+ /**
+ * 绉嶆闈㈢Н
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double area;
- @Schema(title = "鍗＄墖鏁伴噺")
+ /**
+ * 鍗＄墖鏁伴噺
+ */
private Integer cardCount;
- @Schema(title = "鍦板潃")
+ /**
+ * 鍦板潃
+ */
private String address;
- @Schema(title = "澶囨敞")
+ /**
+ * 澶囨敞
+ */
private String remarks;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.8.0