From 74e332504d98caaf8fab951d7d24be762b169f49 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 25 三月 2026 14:15:14 +0800
Subject: [PATCH] 销售金额
---
jyz-base-start/src/main/java/com/tievd/jyz/controller/DataTableController.java | 9 +++++++++
jyz-base-start/src/main/java/com/tievd/jyz/service/impl/OilRecordServiceImpl.java | 20 +++++++++++++++++---
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/jyz-base-start/src/main/java/com/tievd/jyz/controller/DataTableController.java b/jyz-base-start/src/main/java/com/tievd/jyz/controller/DataTableController.java
index 7a40e36..5d25e41 100644
--- a/jyz-base-start/src/main/java/com/tievd/jyz/controller/DataTableController.java
+++ b/jyz-base-start/src/main/java/com/tievd/jyz/controller/DataTableController.java
@@ -115,6 +115,15 @@
return Result.ok(res);
}
+ @PostMapping("/statBar")
+ @Operation(summary = "鍔犳补绔欑粺璁�-鏌辩姸鍥�")
+ public Result<?> statBar(@RequestBody DataStatisReqVo param) {
+ LoginUser user = SystemContextUtil.currentLoginUser();
+ param.setOrgCodeIfnull(user.getOrgCode());
+ JSONObject statBar = oilRecordService.statBar(param);
+ return Result.ok(statBar);
+ }
+
@PostMapping("/statFan")
@Operation(summary = "鍔犳补绔欑粺璁�-涓儴鎶ヨ〃(鎵囧舰鍥�)")
public Result<?> statFan(@RequestBody DataStatisReqVo param) {
diff --git a/jyz-base-start/src/main/java/com/tievd/jyz/service/impl/OilRecordServiceImpl.java b/jyz-base-start/src/main/java/com/tievd/jyz/service/impl/OilRecordServiceImpl.java
index 91c0eeb..3cdf8f9 100644
--- a/jyz-base-start/src/main/java/com/tievd/jyz/service/impl/OilRecordServiceImpl.java
+++ b/jyz-base-start/src/main/java/com/tievd/jyz/service/impl/OilRecordServiceImpl.java
@@ -208,8 +208,8 @@
JSONObject res;
List<StatDataTableVo> dataList;
Function<StatDataTableVo, ?> xfunc;
- Function<StatDataTableVo, Integer> barfunc;
- Function<StatDataTableVo, Integer> linefunc;
+ Function<StatDataTableVo, ?> barfunc;
+ Function<StatDataTableVo, ?> linefunc;
String barName = "";
String lineName = "";
if (param.getType() == 1) {
@@ -219,13 +219,27 @@
linefunc = StatDataTableVo::getCarCount;
barName = "鍔犳补鏁�";
lineName = "杞︽祦閲�";
- } else {
+ } else if (param.getType() == 2) {
dataList = oilRecordMapper.statFanByPosition(param);
xfunc = StatDataTableVo::getOilPosition;
barfunc = StatDataTableVo::getOilCount;
linefunc = StatDataTableVo::getOilVolume;
barName = "鍔犳补鏁�";
lineName = "娌瑰搧閿�閲�";
+ } else if (param.getType() == 3) {
+ dataList = oilRecordMapper.statFanByOilType(param);
+ xfunc = StatDataTableVo::getOilType;
+ barfunc = StatDataTableVo::getOilVolume;
+ linefunc = StatDataTableVo::getTotalAmount;
+ barName = "娌瑰搧閿�閲�";
+ lineName = "閿�鍞噾棰�";
+ } else {
+ dataList = oilRecordMapper.statFanByOilType(param);
+ xfunc = StatDataTableVo::getOilType;
+ barfunc = StatDataTableVo::getTotalAmount;
+ linefunc = StatDataTableVo::getOilVolume;
+ barName = "閿�鍞噾棰�";
+ lineName = "娌瑰搧閿�閲�";
}
res = dataTransLists(dataList, xfunc, barfunc, linefunc, barName, lineName);
return res;
--
Gitblit v1.8.0