From 876d72a43b52fd4de8c37196d4f8dfd92bab4b7e Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 23 十二月 2025 16:37:34 +0800
Subject: [PATCH] feat(production): 添加productId

---
 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 3fed962..9368d70 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -20,20 +20,37 @@
         sum(pr.tickets_amount)as receipt_payment_amount,
         pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
         pl.entry_date,
+        pl.execution_date,
         pl.recorder_name,
         pl.payment_method
         from purchase_ledger pl
         left join product_record pr on pl.id = pr.purchase_ledger_id
         <where>
+            1 = 1
             <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
-                pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+               and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+            </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>
         </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

--
Gitblit v1.9.3