From dc22724f61e0b792d327fa812895f6dc4fcf129d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 08 四月 2026 15:04:11 +0800
Subject: [PATCH] fix:groupBy
---
src/main/resources/mapper/account/AccountExpenseMapper.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/account/AccountExpenseMapper.xml b/src/main/resources/mapper/account/AccountExpenseMapper.xml
index 3b37674..459a584 100644
--- a/src/main/resources/mapper/account/AccountExpenseMapper.xml
+++ b/src/main/resources/mapper/account/AccountExpenseMapper.xml
@@ -44,7 +44,7 @@
sdd.dict_label typeName,
sum(expense_money) account
FROM account_expense ae
- left join sys_dict_data sdd on ae.expense_type = sdd.dict_value and sdd.dict_type='expense_types'
+ left join sys_dict_data sdd on ae.expense_type = sdd.dict_value and sdd.dict_type='expense_types'
where
1=1
<if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
@@ -53,7 +53,7 @@
<if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
AND expense_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
</if>
- group by expense_type
+ group by sdd.dict_label, ae.expense_type
</select>
<select id="report1" resultType="java.math.BigDecimal">
@@ -70,4 +70,26 @@
</if>
</select>
+ <select id="selectAccountExpenseStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
+ SELECT DATE_FORMAT(expense_date, #{dateFormat}) as dateStr, IFNULL(SUM(expense_money), 0) as amount
+ FROM account_expense
+ WHERE expense_date BETWEEN #{startDate} AND #{endDate}
+ GROUP BY dateStr
+ </select>
+
+ <select id="selectExpenseComposition" resultType="com.ruoyi.dto.MapDto">
+ SELECT sdd.dict_label as name, CAST(IFNULL(SUM(ae.expense_money), 0) AS CHAR) as value
+ FROM account_expense ae
+ LEFT JOIN sys_dict_data sdd ON ae.expense_type = sdd.dict_value AND sdd.dict_type = 'expense_types'
+ <where>
+ <if test="startDate != null and startDate != ''">
+ AND ae.expense_date >= #{startDate}
+ </if>
+ <if test="endDate != null and endDate != ''">
+ AND ae.expense_date <= #{endDate}
+ </if>
+ </where>
+ GROUP BY ae.expense_type, sdd.dict_label
+ </select>
+
</mapper>
--
Gitblit v1.9.3