From 595b66ae8800511fab34e503f94d173613088c08 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期六, 01 三月 2025 09:57:38 +0800 Subject: [PATCH] 1、表阀一体机新协议开阀报关阀报数据处理逻辑修改; 2、农户月用水统计查询中,缺少农户姓名,进行SQL修改。 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java index fb9273d..3667237 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java @@ -9,6 +9,7 @@ import com.dy.common.mybatis.envm.Deleted; import com.dy.common.mybatis.envm.Disabled; import com.dy.common.po.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; @@ -117,12 +118,13 @@ * 绉嶆闈㈢Н */ @Schema(description = "鍐滄埛绉嶆闈㈢Н", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" ) public Double area; /** * 鍘垮悕绉�+闀囧悕绉�+鏉戝悕绉帮紝涓嶅彲濉啓锛岃嚜鍔ㄧ敓鎴� */ - //@Schema(description = "鍘垮悕绉�+闀囧悕绉�+鏉戝悕绉�") + @Schema(description = "鍘垮悕绉�+闀囧悕绉�+鏉戝悕绉帮紝form琛ㄥ崟涓笉瀛樺湪锛屽彧鍦ㄦ煡璇㈡樉绀轰腑鏈夋晥", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public String district; /** @@ -151,15 +153,15 @@ /** * 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎. */ - @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ~鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @Schema(description = "鍒犻櫎鏍囪瘑锛宖orm琛ㄥ崟涓笉瀛樺湪锛屽彧鍦ㄦ煡璇㈡樉绀轰腑鏈夋晥", requiredMode = Schema.RequiredMode.NOT_REQUIRED) public Deleted deleted; @TableField(exist = false) - @Schema(description = "鎵�鍦ㄧ墖鍖哄悕绉帮紝鍙湪鏌ヨ涓湁鏁�") + @Schema(description = "鎵�鍦ㄧ墖鍖哄悕绉帮紝form琛ㄥ崟涓笉瀛樺湪锛屽彧鍦ㄦ煡璇㈡樉绀轰腑鏈夋晥") public String blockName ; @TableField(exist = false) - @Schema(description = "鎵�灞炲啘鎴风被鍨嬪悕绉帮紝鍙湪鏌ヨ涓湁鏁�") + @Schema(description = "鎵�灞炲啘鎴风被鍨嬪悕绉帮紝form琛ㄥ崟涓笉瀛樺湪锛屽彧鍦ㄦ煡璇㈡樉绀轰腑鏈夋晥") public String typeName ; } \ No newline at end of file -- Gitblit v1.8.0