From a8a9bac5d436225876c50fe766264df86e276daa Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 2 Sep 2025 09:50:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=B6=8B=E5=8A=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/funds/organamount/OrganAmountController.java | 8 +++++++- .../service/funds/organamount/OrganAmountService.java | 7 ++++--- .../service/funds/organamount/OrganAmountServiceImpl.java | 4 ++-- .../resources/mapper/funds/amount/OrganAmountMapper.xml | 7 +++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/organamount/OrganAmountController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/organamount/OrganAmountController.java index 791b24135..b2e5624c8 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/organamount/OrganAmountController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/organamount/OrganAmountController.java @@ -49,6 +49,12 @@ public class OrganAmountController { @GetMapping("/statistics/consumptionTrend") @Operation(summary = "获取组织消费趋势") public CommonResult> getOrganConsumptionTrend(@Valid OrganFundsStatisticsReqVO reqVO) { - return success(organAmountService.getOrganConsumptionTrend(reqVO)); + return success(organAmountService.getConsumptionTrend(reqVO, true)); + } + + @GetMapping("/manage/statistics/consumptionTrend") + @Operation(summary = "获取管理端消费趋势") + public CommonResult> getManageConsumptionTrend(@Valid OrganFundsStatisticsReqVO reqVO) { + return success(organAmountService.getConsumptionTrend(reqVO, false)); } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountService.java index 67d06e7e7..422911e0f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountService.java @@ -1,6 +1,5 @@ package com.cf.imes.module.system.service.funds.organamount; - import com.cf.imes.module.system.controller.admin.funds.organamount.vo.AllOrganAmountRespVO; import com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganAmountRespVO; import com.cf.imes.module.system.controller.admin.funds.organamount.vo.OrganFundsStatisticsReqVO; @@ -64,9 +63,11 @@ public interface OrganAmountService { AllOrganAmountRespVO getOrganAmountAll(); /** - * 获取组织消费趋势 + * 获取消费趋势 * + * @param reqVO + * @param queryOrg 是否查询单个组织下 * @return */ - Map getOrganConsumptionTrend(OrganFundsStatisticsReqVO reqVO); + Map getConsumptionTrend(OrganFundsStatisticsReqVO reqVO, boolean queryOrg); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java index 1c28296aa..b74bfbac2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/organamount/OrganAmountServiceImpl.java @@ -222,7 +222,7 @@ public class OrganAmountServiceImpl implements OrganAmountService { } @Override - public Map getOrganConsumptionTrend(OrganFundsStatisticsReqVO reqVO) { + public Map getConsumptionTrend(OrganFundsStatisticsReqVO reqVO, boolean queryOrg) { Map resultMap = new HashMap<>(); // 所有的日期集合 List dateList = getDateList(reqVO); @@ -232,7 +232,7 @@ public class OrganAmountServiceImpl implements OrganAmountService { Map orgAmountSeriesItem = new HashMap<>(); // 查询组织收支趋势统计 - Map> organIncomeExpenseGroupByCreateTimeRespMap = organAmountMapper.selectOrganIncomeExpenseTrendGroupByCreateTime(reqVO, organId).stream() + Map> organIncomeExpenseGroupByCreateTimeRespMap = organAmountMapper.selectOrganIncomeExpenseTrendGroupByCreateTime(reqVO, queryOrg ? organId : null).stream() .sorted(Comparator.naturalOrder()) .collect(Collectors.groupingBy(OrganAmountGroupByCreateTimeRespVO::getDate, LinkedHashMap::new, Collectors.toList())); diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/amount/OrganAmountMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/amount/OrganAmountMapper.xml index 52b9a0f21..f8b9de1df 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/amount/OrganAmountMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/amount/OrganAmountMapper.xml @@ -22,8 +22,11 @@ select sum(cash_amount_change) as amount from income_expense_details - where organ_id = #{organId} - and create_time between #{req.createTime[0]} and #{req.createTime[1]} + where create_time between #{req.createTime[0]} and #{req.createTime[1]} + + and organ_id = #{organId} + GROUP BY date + \ No newline at end of file