提交代码

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);
             }