From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展

---
 src/main/resources/mapper/sales/SalesLedgerMapper.xml |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 2d6b7f8..1cd1c37 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -19,6 +19,16 @@
         T1.sales_contract_no,
         T1.customer_contract_no,
         T1.project_name,
+        T1.project_id,
+        T1.year,
+        T1.signing_unit_id,
+        T1.office_id,
+        T1.group_leader_id,
+        T1.is_invoice,
+        T1.bid_price,
+        T1.is_bid,
+        T1.unbid_reason,
+        T1.contract_original_return_date,
         T1.entry_date,
         T1.salesman,
         T1.customer_id,
@@ -37,7 +47,10 @@
         LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
         <where>
             <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
-                T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+                AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+            </if>
+            <if test="salesLedgerDto.projectId != null">
+                AND T1.project_id = #{salesLedgerDto.projectId}
             </if>
         </where>
     </select>
@@ -47,6 +60,16 @@
         T1.sales_contract_no,
         T1.customer_contract_no,
         T1.project_name,
+        T1.project_id,
+        T1.year,
+        T1.signing_unit_id,
+        T1.office_id,
+        T1.group_leader_id,
+        T1.is_invoice,
+        T1.bid_price,
+        T1.is_bid,
+        T1.unbid_reason,
+        T1.contract_original_return_date,
         T1.entry_date,
         T1.salesman,
         T1.customer_id,
@@ -80,6 +103,9 @@
             <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
                 AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
             </if>
+            <if test="salesLedgerDto.projectId != null">
+                AND T1.project_id = #{salesLedgerDto.projectId}
+            </if>
             <if test="salesLedgerDto.customerContractNo != null and salesLedgerDto.customerContractNo !='' ">
                 AND T1.customer_contract_no LIKE CONCAT('%',#{salesLedgerDto.customerContractNo},'%')
             </if>

--
Gitblit v1.9.3