From 4bc5510b67c0715be52ee482a56ccd4addac37ef Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Mon, 23 May 2022 16:55:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bweb/controller/HighGasController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java index c3994439..57e98c36 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighGasController.java @@ -205,7 +205,7 @@ public class HighGasController { data = new ArrayList<>(); data.add(orderModel.getOrderNo()); data.add(orderModel.getGasName()); - data.add(orderModel.getGasOilType().equals(1) ? "汽油": "柴油"); + data.add(orderModel.getGasOilType().equals("1") ? "汽油": "柴油"); data.add(orderModel.getGasOilNo() + "#"); data.add(orderModel.getGasGunNo() + "号"); data.add(orderModel.getGasPriceGun()); @@ -215,7 +215,6 @@ public class HighGasController { data.add(orderModel.getPayRealPrice()); data.add(orderModel.getDeductionPrice()); data.add(DateUtil.date2String(orderModel.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); - data.add(DateUtil.date2String(orderModel.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); data.add(OrderStatusEnum.getNameByType(orderModel.getStatus())); dataList.add(data); }