From f9a3ac34d690aafc96757370e1f6f948ad98368d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 17:28:12 +0800
Subject: [PATCH] yys 1.回款登记台账页面,增加一个开票日期列 2.销售台账,在合同金额后面,增加已开票金额、待开票金额、已回款金额、待回款金额

---
 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 &gt;= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
+        </if>
+        <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
+            AND income_date &lt;= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3