From c9e784140d837cb27a4f93935b08bbb739d47c8e Mon Sep 17 00:00:00 2001 From: maven <2163098428@qq.com> Date: 星期三, 13 八月 2025 17:08:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys' --- src/main/resources/mapper/account/AccountIncomeMapper.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/account/AccountIncomeMapper.xml b/src/main/resources/mapper/account/AccountIncomeMapper.xml index bfb6d73..1cb49b9 100644 --- a/src/main/resources/mapper/account/AccountIncomeMapper.xml +++ b/src/main/resources/mapper/account/AccountIncomeMapper.xml @@ -56,4 +56,17 @@ </if> group by income_type </select> + <select id="report1" resultType="java.math.BigDecimal"> + SELECT + sum(income_money) account + FROM account_income ai + where + income_type=#{dictValue} + <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' "> + AND income_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d') + </if> + <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' "> + AND income_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d') + </if> + </select> </mapper> -- Gitblit v1.9.3