From 2e7836b2e30a34d90383df3c121780c1d9dee600 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Mon, 21 Feb 2022 14:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BF=94=E5=9B=9E=E7=9A=84=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xhpc/log/controller/PileLogController.java | 2 ++ .../src/main/resources/mapper/XhpcDeviceMessageMapper.xml | 4 ++-- .../src/main/resources/mapper/XhpcHistoryOrderMapper.xml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java index cfd96e3b..fdb9c66a 100644 --- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java +++ b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java @@ -50,6 +50,8 @@ public class PileLogController extends BaseController { return getDataTable(pileLogService.getPileRunLogPage(pileId, startTime, endTime)); } + + @PostMapping("/export") public void export(HttpServletResponse response, @RequestParam("pileId") String pileId, diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml index 18b1c9f6..7bb54eae 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -38,9 +38,9 @@ charge_order_no as 'chargeOrderNo', status as 'status', remark as 'remark', - create_time as 'createTime', + replace(create_time, 'T', ' ') as 'createTime', create_by as 'createBy', - update_time as 'updateTime', + replace(update_time, 'T', ' ') as 'updateTime', update_by as 'updateBy' from xhpc_device_message where charge_order_no=#{chargeOrderNo} diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 8d53e278..f270986a 100644 --- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -10,8 +10,8 @@ when 1 then '流量方用户' when 2 then '社区用户' when 3 then 'B端用户' end as 'sourceName', - co.start_time as 'startTime', - co.end_time as 'endTime' + replace(co.start_time, 'T', ' ') as 'startTime', + replace(co.end_time, 'T', ' ') as 'endTime' from xhpc_charge_order as co left join xhpc_charging_station as st on st.charging_station_id =co.charging_station_id where co.del_flag =0