From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug（新生成了记录，应该是更新老记录），修改之 ； 2、CommonV1_0_0中获取开关阀类型名称时，对于null返回空字符串。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 9a85b2a..ef1acfa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -8,6 +8,7 @@
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 lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -83,6 +84,7 @@
*/
@ExcelProperty(value = {"${title}", "浜ゆ槗閲戦"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double tradeAmount;
/**
@@ -90,6 +92,7 @@
*/
@ExcelProperty(value = {"${title}", "璐按閲戦"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterCost;
/**
@@ -97,6 +100,7 @@
*/
@ExcelProperty(value = {"${title}", "璐崱閲戦"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double cardCost;
/**
@@ -104,6 +108,7 @@
*/
@ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double gift;
/**
@@ -111,6 +116,7 @@
*/
@ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double refundAmount;
/**
@@ -118,6 +124,7 @@
*/
@ExcelProperty(value = {"${title}", "浣欓"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double money;
/**
--
Gitblit v1.8.0