From a3f8ef130d998973a5d36bb196e1607827de81e8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 16:06:13 +0800
Subject: [PATCH] 增加Modbus协议：温控控制
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 1eadec8..d04efe0 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -399,8 +399,8 @@
(dept == null ? "鍏ュ簱鍖栭獙鍗�" : dept.getName() + "鍏ュ簱鍖栭獙鍗�"));
// 鏇挎崲鍩虹鏁版嵁
- String time = DateFormatUtils.format(data.getRegisterTime(),
- "yyyy-MM-dd");
+// String time = DateFormatUtils.format(data.getRegisterTime(),
+// "yyyy-MM-dd");
String checkTime = data.getCheckTime() == null ? "-" : DateFormatUtils.format(data.getCheckTime(), "yyyy-MM-dd HH:mm:ss");
String sampleTime = data.getSampleTime() == null ? "-" : DateFormatUtils.format(data.getSampleTime(), "yyyy-MM-dd HH:mm:ss");
String reportTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss");
@@ -610,12 +610,12 @@
}
// htmlStr = htmlStr.replace("driverName", settle.getUserName() + "");
// htmlStr = htmlStr.replace("otherSum", settle.getOtherSum() + "");
- htmlStr = htmlStr.replace("paySum", settle.getPaySum() + "");
+ htmlStr = htmlStr.replace("paySum", settle.getPayMoney() + "");
htmlStr = htmlStr.replace("remark", settle.getRemarks() == null ? ""
: settle.getRemarks());
htmlStr = htmlStr.replace("moneyName",
- MoneyUtil.formatToCN(new BigDecimal(settle.getPaySum())));
+ MoneyUtil.formatToCN(new BigDecimal(settle.getPayMoney())));
return htmlStr;
}
--
Gitblit v1.9.3