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/pojoRm/RmOpenCloseValveHistory.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
index d6b4b0b..1f41e07 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOpenCloseValveHistory.java
@@ -47,6 +47,20 @@
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
public Long id;
+
+ /**
+ * 鍐滄埛瀹炰綋ID锛堝閿級
+ */
+ @Schema(description = "鍐滄埛瀹炰綋澶栭敭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long clientId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ @Schema(description = "鍐滄埛濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String clientName;
+
/**
* 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
*/
@@ -84,6 +98,7 @@
* 寮�闃�鏃剁疮璁℃祦閲�
*/
@Schema(description = "寮�闃�鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double opTotalAmount;
/**
@@ -102,6 +117,7 @@
* 寮�闃�鏃跺墿浣欓噾棰�
*/
@Schema(description = "寮�闃�鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double opRemainMoney;
/**
@@ -114,12 +130,14 @@
* 寮�闃�鏃剁數琛ㄧ疮璁＄數閲�
*/
@Schema(description = "寮�闃�鏃剁數琛ㄧ疮璁＄數閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double opEleTotalAmount;
/**
* 寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺
*/
@Schema(description = "寮�闃�鏃剁敤姘存埛鍓╀綑姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double opWaterRemainUser;
/**
@@ -144,6 +162,7 @@
* 鍏抽榾鏃剁疮璁℃祦閲�
*/
@Schema(description = "鍏抽榾鏃剁疮璁℃祦閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double clTotalAmount;
/**
@@ -162,18 +181,21 @@
* 鍏抽榾鏃跺墿浣欓噾棰�
*/
@Schema(description = "鍏抽榾鏃跺墿浣欓噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double clRemainMoney;
/**
* 鍏抽榾鎶ヤ腑鏈鐢ㄦ按閲�
*/
@Schema(description = "鍏抽榾鏃舵湰娆＄敤姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double clThisAmount;
/**
* 鍏抽榾鎶ヤ腑鏈娑堣垂閲戦
*/
@Schema(description = "鍏抽榾鏃舵湰娆℃秷璐归噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double clThisMoney;
/**
@@ -181,6 +203,13 @@
*/
@Schema(description = "鍏抽榾鏃舵湰娆＄敤姘存椂闀匡紙鍒嗛挓锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Integer clThisTime;
+
+ /**
+ * 鍏抽榾鎶ヤ腑姘翠环
+ */
+ @Schema(description = "鍏抽榾鎶ヤ腑姘翠环", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double clPrice ;//姘翠环
/**
* 鍏抽榾鎶ヤ腑鐨勫紑闃�鏃舵帶鍒跺櫒鏃堕挓
@@ -202,16 +231,19 @@
/**
* 鐢佃〃绱鐢甸噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double clEleTotalAmount;
/**
* 鐢ㄦ埛鍓╀綑姘撮噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double clWaterRemainUser;
/**
* 鏈浣跨敤鐢甸噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double clThisEle;
public void valueFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo) throws Exception {
@@ -234,6 +266,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -253,6 +286,7 @@
this.clThisAmount = dataCd83CloseVo.thisAmount;
this.clThisMoney = dataCd83CloseVo.thisMoney;
this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clPrice = dataCd83CloseVo.price;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt);
@@ -282,6 +316,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -302,13 +337,14 @@
this.clThisAmount = cdData.thisWater;
this.clThisMoney = cdData.thisMoney;
this.clThisTime = cdData.thisDuration;
+ this.clPrice = null;
this.clOrderNo = cdData.orderNo;
this.clEleTotalAmount = cdData.eleTotalAmount;
this.clWaterRemainUser = cdData.waterRemain;
this.clThisEle = cdData.thisEle;
}
- public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, boolean clearCloseValve) throws Exception {
+ public void updateFrom(DataV1_0_1 dV1_0_1, DataCd83OpenVo dataCd83OpenVo, Boolean clearCloseValve) throws Exception {
this.opDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
this.opType = dataCd83OpenVo.type;
this.opTotalAmount = dataCd83OpenVo.totalAmount;
@@ -316,7 +352,7 @@
this.opIcCardAddr = dataCd83OpenVo.icCardAddr;
this.opRemainMoney = dataCd83OpenVo.remainMoney;
this.openDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83OpenVo.openDt);
- if (clearCloseValve) {
+ if (clearCloseValve != null && clearCloseValve.booleanValue()) {
this.clDt = null;
this.clType = null;
this.clTotalAmount = null;
@@ -326,6 +362,7 @@
this.clThisAmount = null;
this.clThisMoney = null;
this.clThisTime = null;
+ this.clPrice = null;
this.clOpenDt = null;
this.closeDt = null;
@@ -347,6 +384,7 @@
this.clThisAmount = dataCd83CloseVo.thisAmount;
this.clThisMoney = dataCd83CloseVo.thisMoney;
this.clThisTime = dataCd83CloseVo.thisTime;
+ this.clPrice = dataCd83CloseVo.price;
this.clOpenDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt);
this.closeDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt) ;
--
Gitblit v1.8.0