From 9e31a333ceb9e6a51d18c808eabffd8cebc8cb4e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 11:35:49 +0800
Subject: [PATCH] refactor(core): 删除销售台账及相关代码中与发票和待付款金额关联的逻辑

---
 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml |   85 +++++++-----------------------------------
 1 files changed, 15 insertions(+), 70 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index efeda16..a99d356 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -9,78 +9,23 @@
         SET contract_amount = #{totalTaxInclusiveAmount}
         WHERE id = #{id}
     </update>
-    <select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.dto.PurchaseLedgerDto">
-        select
-        pl.id,
-        pl.purchase_contract_number ,
-        pl.sales_contract_no,
-        pl.supplier_id,
-        pl.supplier_name,
-        pl.project_name,
-        pl.contract_amount,
-        sum(tr.invoice_amount)as receipt_payment_amount,
-        pl.contract_amount-sum(tr.invoice_amount) AS unReceipt_payment_amount,
-        pl.entry_date,
-        pl.execution_date,
-        pl.recorder_id,
-        pl.recorder_name,
-        pl.template_name,
-        pl.approve_user_ids,
-        sm.is_white,
-        pl.approval_status,
-        pl.payment_method
-        from purchase_ledger pl
-        left join sales_ledger_product slp on slp.sales_ledger_id = pl.id and slp.type=2
-        left join product_record pr on pl.id = pr.purchase_ledger_id
-        left join ticket_registration tr on tr.id = pr.ticket_registration_id
-        left join supplier_manage sm on pl.supplier_id = sm.id
+    <select id="selectPurchaseStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
+        SELECT DATE_FORMAT(entry_date, #{dateFormat}) as dateStr, IFNULL(SUM(contract_amount), 0) as amount
+        FROM purchase_ledger
+        WHERE entry_date BETWEEN #{startDate} AND #{endDate}
+        GROUP BY dateStr
+    </select>
+
+    <select id="selectTotalPurchaseAmount" resultType="java.math.BigDecimal">
+        SELECT IFNULL(SUM(contract_amount), 0)
+        FROM purchase_ledger
         <where>
-            1 = 1
-            <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
-               and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+            <if test="startDate != null and startDate != ''">
+                AND entry_date &gt;= #{startDate}
             </if>
-            <if test="c.approvalStatus != null and c.approvalStatus != ''">
-                and pl.approval_status = #{c.approvalStatus}
-            </if>
-            <if test="c.supplierName != null and c.supplierName != ''">
-                and pl.supplier_name like concat('%',#{c.supplierName},'%')
-            </if>
-            <if test="c.salesContractNo != null and c.salesContractNo != ''">
-                and pl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
-            </if>
-            <if test="c.projectName != null and c.projectName != ''">
-                and pl.project_name like concat('%',#{c.projectName},'%')
-            </if>
-            <if test="c.entryDateStart != null and c.entryDateStart != '' ">
-                AND pl.entry_date &gt;= DATE_FORMAT(#{c.entryDateStart},'%Y-%m-%d')
-            </if>
-            <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
-                AND  pl.entry_date &lt;= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
+            <if test="endDate != null and endDate != ''">
+                AND entry_date &lt;= #{endDate}
             </if>
         </where>
-        group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
-        pl.project_name,pl.entry_date,
-        pl.recorder_name,
-        pl.contract_amount
-        order by pl.entry_date desc
-
     </select>
-    <select id="getPaymentRegistrationDtoById" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
-        SELECT
-            T1.id,
-            T1.payment_date,
-            T2.supplier_name,
-            T1.current_payment_amount,
-            T1.payment_method,
-            T3.nick_name AS registrant,
-            T1.registrationt_date
-        FROM
-            payment_registration T1
-                LEFT JOIN
-            supplier_manage T2 ON T1.supplier_id = T2.id
-                LEFT JOIN
-            sys_user T3 ON T3.user_id = T1.registrant_id
-        WHERE
-            T1.sales_ledger_product_id = #{id}
-    </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3