From 19bd3e436a26731eb82bebd6f82eb39dd79221f0 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 03 六月 2026 09:50:29 +0800
Subject: [PATCH] feat(shipping): 添加审批节点记录功能
---
src/main/resources/mapper/account/AccountIncomeMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/account/AccountIncomeMapper.xml b/src/main/resources/mapper/account/AccountIncomeMapper.xml
index 56d254d..492834f 100644
--- a/src/main/resources/mapper/account/AccountIncomeMapper.xml
+++ b/src/main/resources/mapper/account/AccountIncomeMapper.xml
@@ -47,7 +47,7 @@
AND income_method = #{accountIncome.incomeMethod}
</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,
ifnull(sum(income_money),0) account
@@ -61,7 +61,7 @@
<if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
AND income_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
</if>
- group by income_type
+ GROUP BY sdd.dict_label, ai.income_type
</select>
<select id="report1" resultType="java.math.BigDecimal">
SELECT
--
Gitblit v1.9.3