From 73e8632e1082843e1736d86d3e5fa6a4ee0b4e7d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 08 五月 2026 13:35:42 +0800
Subject: [PATCH] fix:1.领料，补料，退料，增加库存出入库记录

---
 src/main/resources/mapper/account/AccountExpenseMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/account/AccountExpenseMapper.xml b/src/main/resources/mapper/account/AccountExpenseMapper.xml
index e954562..77eed00 100644
--- a/src/main/resources/mapper/account/AccountExpenseMapper.xml
+++ b/src/main/resources/mapper/account/AccountExpenseMapper.xml
@@ -45,7 +45,7 @@
             AND expense_method = #{accountExpense.expenseMethod}
         </if>
     </select>
-    <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
+    <select id="report" resultType="com.ruoyi.account.bean.dto.AccountDto2">
         SELECT
         sdd.dict_label typeName,
         sum(expense_money) account
@@ -59,7 +59,7 @@
         <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
             AND expense_date &lt;= 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">

--
Gitblit v1.9.3