From 9d42f647f5589e4a560d745d6b359ae6c273bd8d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 13:08:52 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/resources/mapper/account/AccountExpenseMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/account/AccountExpenseMapper.xml b/src/main/resources/mapper/account/AccountExpenseMapper.xml
index 1a8d34b..77eed00 100644
--- a/src/main/resources/mapper/account/AccountExpenseMapper.xml
+++ b/src/main/resources/mapper/account/AccountExpenseMapper.xml
@@ -10,6 +10,12 @@
<if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
AND expense_date >= DATE_FORMAT(#{accountExpense.entryDateStart},'%Y-%m-%d')
</if>
+ <if test=" accountExpense.supplierName != null and accountExpense.supplierName != ''">
+ AND supplier_name like CONCAT('%',#{accountExpense.supplierName},'%')
+ </if>
+ <if test=" accountExpense.invoiceNumber != null and accountExpense.invoiceNumber != ''">
+ AND invoice_number like CONCAT('%',#{accountExpense.invoiceNumber},'%')
+ </if>
<if test="accountExpense.entryDateEnd != null and accountExpense.entryDateEnd != '' ">
AND expense_date <= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
</if>
@@ -39,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
@@ -53,7 +59,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">
--
Gitblit v1.9.3