From 31e886626239a4e855cc2ac1a97f774035b0dd23 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Tue, 23 Jul 2024 21:13:58 +0800 Subject: [PATCH] no message --- fuintAdmin_zt/src/api/allOrder.js | 35 ++++++ .../src/api/sys/sysNotificationlog.js | 24 ++++ fuintAdmin_zt/src/api/sys/sysNotify.js | 37 ++++++ .../dai_yunyingfenxi/tab/paym.vue | 59 ++++------ .../dai_yunyingfenxi/tab/paytype.vue | 50 +++----- .../src/views/system/notify/page/mode.vue | 94 ++++++++------- .../src/views/system/notify/page/record.vue | 110 +++++++++--------- .../controller/AllOrderInfoController.java | 25 ++++ .../business/order/entity/AllOrderInfo.java | 4 + .../order/mapper/AllOrderInfoMapper.java | 7 +- .../order/mapper/xml/AllOrderInfoMapper.xml | 64 +++++++++- .../order/mapper/xml/OilOrderMapper.xml | 12 +- .../order/service/AllOrderInfoService.java | 3 + .../service/impl/AllOrderInfoServiceImpl.java | 45 ++++++- .../business/order/vo/AllOrderInfoVo.java | 11 ++ .../business/order/vo/Excel/allorderVOo.java | 10 ++ .../fuint/business/sys/entity/SysNotify.java | 4 + .../sys/mapper/xml/SysNotifyMapper.xml | 7 +- 18 files changed, 427 insertions(+), 174 deletions(-) create mode 100644 fuintAdmin_zt/src/api/sys/sysNotify.js create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/allorderVOo.java diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js index 29f9a9e99..88be902ca 100644 --- a/fuintAdmin_zt/src/api/allOrder.js +++ b/fuintAdmin_zt/src/api/allOrder.js @@ -100,6 +100,7 @@ export function getTissueByDataApi(query) { } + export function exportExcelTradingApi(data) { return request({ url: 'business/allOrderInfo/tradingExportExcel', @@ -136,3 +137,37 @@ export function exportExcelDayApi(data) { data: data // 通过 data 参数传递需要的数据 }); } + +export function getFenxiByDailiApi(query) { + return request({ + url: 'business/allOrderInfo/getFenxiByDaili', + method: 'get', + params: query + + }) +} +export function getFenxiByDailiByDataApi(query) { + return request({ + url: 'business/allOrderInfo/getFenxiByDailiBydata', + method: 'get', + params: query + + }) +} + +export function getFenxiByDailiTypeApi(query) { + return request({ + url: 'business/allOrderInfo/getFenxiByDailiType', + method: 'get', + params: query + + }) +} +export function getFenxiByDailgetFenxiByDailiTypeiByDataApi(query) { + return request({ + url: 'business/allOrderInfo/getFenxiByDailiBydata', + method: 'get', + params: query + + }) +} diff --git a/fuintAdmin_zt/src/api/sys/sysNotificationlog.js b/fuintAdmin_zt/src/api/sys/sysNotificationlog.js index 3ebdce5eb..ad771e1e9 100644 --- a/fuintAdmin_zt/src/api/sys/sysNotificationlog.js +++ b/fuintAdmin_zt/src/api/sys/sysNotificationlog.js @@ -18,3 +18,27 @@ export function getSysNotifyList(query) { }) } +export function deleteSysNotifyApi(PayId) { + return request({ + url: 'sysNotificationlog/' + PayId, + method: 'delete' + + }) +} +// +export function saveSysNotificationApi(data) { + return request({ + url: 'sysNotificationlog', + method: 'post', + data: data + }) +} + +// 保存修改信息 +export function updateSysNotificationApi(data) { + return request({ + url: 'sysNotificationlog', + method: 'put', + data: data + }) +} diff --git a/fuintAdmin_zt/src/api/sys/sysNotify.js b/fuintAdmin_zt/src/api/sys/sysNotify.js new file mode 100644 index 000000000..5f47bf4e2 --- /dev/null +++ b/fuintAdmin_zt/src/api/sys/sysNotify.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + + +// 分页查询所有的订单信息 +export function getSysNotifyList(query) { + return request({ + url: 'sysNotify/queryByPage', + method: 'get', + params: query + + }) +} +// +export function deleteSysNotifyApi(PayId) { + return request({ + url: 'sysNotify/' + PayId, + method: 'delete' + + }) +} +// +export function saveSysNotifyApi(data) { + return request({ + url: 'sysNotify', + method: 'post', + data: data + }) +} + +// 保存修改信息 +export function updateSysNotifyApi(data) { + return request({ + url: 'sysNotify', + method: 'put', + data: data + }) +} diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue index f71614425..4b917cc88 100644 --- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue +++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue @@ -72,29 +72,14 @@
-
累计交易金额（万元）
-
{{orderStatistics.amount}}
+
交易金额汇总数（万元）/交易笔数
+
{{orderStatistics.payMoney}}/{{orderStatistics.count}}
-
-
累计交易升数
-
{{orderStatistics.num}}
-
-
-
92#汽油交易金额（万元）
-
{{orderStatistics.amount92}}
-
-
-
95#汽油交易金额（万元）
-
{{orderStatistics.amount95}}
-
-
-
98#汽油交易金额（万元）
-
{{orderStatistics.amount98}}
-
-
-
0#柴油交易金额（万元）
-
{{orderStatistics.amount0}}
+
+
{{item.paymentChannel}}交易金额（万元）
+
{{item.payMoneyChannel}}
+
@@ -106,13 +91,16 @@ style="width: 100%"> - - - + + + - - - + + @@ -138,7 +126,7 @@