From 0b39edb68acc67ed01fbfe5d31bfa776a1b17de1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 25 三月 2026 09:14:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/show-demo' into show_demo
---
jyz-base-start/src/main/java/com/tievd/jyz/controller/DataTableController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 e180133..7a40e36 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
@@ -127,6 +127,8 @@
@PostMapping("/statTrend")
@Operation(summary = "鍔犳补绔欑粺璁�-椤堕儴鏉″舰鍥�")
public Result<?> statTrend(@RequestBody DataStatisReqVo param) {
+ LoginUser user = SystemContextUtil.currentLoginUser();
+ param.setOrgCodeIfnull(user.getOrgCode());
JSONObject statFan;
if (param.getTrendType() == DataStatisReqVo.TrendType.CLIENT || param.getTrendType() == DataStatisReqVo.TrendType.LOSE_CLIENT) {
statFan = oilRecordService.statTrendClient(param);
@@ -135,6 +137,15 @@
}
return Result.ok(statFan);
}
+
+ @PostMapping("/statTrendDetail")
+ @Operation(summary = "鍔犳补绔欑粺璁�-瓒嬪娍鍒嗘瀽鏄庣粏")
+ public Result<?> statTrendDetail(@RequestBody DataStatisReqVo param) {
+ LoginUser user = SystemContextUtil.currentLoginUser();
+ param.setOrgCodeIfnull(user.getOrgCode());
+ List<Map<String, Object>> list = oilRecordService.statTrendDetail(param);
+ return Result.ok(list);
+ }
}
--
Gitblit v1.8.0