From bc0193e94c96c7ea60be17d250e00408dc787a87 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 18 十一月 2025 17:44:07 +0800
Subject: [PATCH] yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维护-内控值为非必填 6.所有税率都自己填,有时候可能不含税

---
 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