From 252905374177e0d8d98430cb33cf79840479a3fe Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 15 八月 2025 15:12:12 +0800
Subject: [PATCH] 修改关联

---
 service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
index 1516884..32289c7 100644
--- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
@@ -55,11 +55,11 @@
         <result property="updateTime"    column="update_time"    />
         <result property="isCreate"    column="is_create"    />
         <result property="billId"    column="bill_id"    />
-        <result property="billId"    column="bill_name"    />
+        <result property="billName"    column="bill_name"    />
     </resultMap>
 
     <sql id="selectPendingSettlementBusinessVo">
-        select thisTab.id, thisTab.booking_no, thisTab.customer_id, thisTab.carrier_id, thisTab.project_name, thisTab.dispatch_no, thisTab.created_time, thisTab.transport_mode, thisTab.product_id, thisTab.customer_name, thisTab.operation_mode, thisTab.carrier_name, thisTab.departure_location, thisTab.arrival_location, thisTab.vehicle_id, thisTab.license_plate_number, thisTab.vehicle_type, thisTab.main_driver, thisTab.assistant_driver, thisTab.point_num, thisTab.business_contact, thisTab.estimated_total_income, thisTab.estimated_total_cost, thisTab.estimated_profit, thisTab.electronic_lock, thisTab.re_weighing_weight, thisTab.quantity, thisTab.actual_departure_time, thisTab.required_arrival_time, thisTab.actual_arrival_time, thisTab.be_return, thisTab.dispatch_quantity, thisTab.dispatch_weight, thisTab.dispatch_volume, thisTab.empty_mileage, thisTab.empty_fuel, thisTab.heavy_mileage, thisTab.heavy_fuel, thisTab.be_scheduled, thisTab.tracking_no, thisTab.seal_no, thisTab.schedule_no, thisTab.transport_status, thisTab.estimated_bill_id, thisTab.settlement_bill_id, thisTab.settlement_status, thisTab.create_time, thisTab.update_time, thisTab.is_create, thisTab.bill_name from pending_settlement_business AS thisTab
+        select thisTab.id, thisTab.booking_no, thisTab.customer_id, thisTab.carrier_id, thisTab.project_name, thisTab.dispatch_no, thisTab.created_time, thisTab.transport_mode, thisTab.product_id, thisTab.customer_name, thisTab.operation_mode, thisTab.carrier_name, thisTab.departure_location, thisTab.arrival_location, thisTab.vehicle_id, thisTab.license_plate_number, thisTab.vehicle_type, thisTab.main_driver, thisTab.assistant_driver, thisTab.point_num, thisTab.business_contact, thisTab.estimated_total_income, thisTab.estimated_total_cost, thisTab.estimated_profit, thisTab.electronic_lock, thisTab.re_weighing_weight, thisTab.quantity, thisTab.actual_departure_time, thisTab.required_arrival_time, thisTab.actual_arrival_time, thisTab.be_return, thisTab.dispatch_quantity, thisTab.dispatch_weight, thisTab.dispatch_volume, thisTab.empty_mileage, thisTab.empty_fuel, thisTab.heavy_mileage, thisTab.heavy_fuel, thisTab.be_scheduled, thisTab.tracking_no, thisTab.seal_no, thisTab.schedule_no, thisTab.transport_status, thisTab.estimated_bill_id, thisTab.settlement_bill_id, thisTab.bill_id, thisTab.settlement_status, thisTab.create_time, thisTab.update_time, thisTab.is_create, thisTab.bill_name from pending_settlement_business AS thisTab
     </sql>
     <sql id="selectPendingSettlementBusinessVoCount">
         select count(0) from pending_settlement_business as thisTab
@@ -272,6 +272,16 @@
     </select>
     <select id="selectCustomName" resultType="java.lang.String">
         SELECT customer_name from pending_settlement_business group by customer_name
+
+    </select>
+    <select id="selectPendingSettlementBusinessDispatchNos" resultType="java.lang.String">
+        SELECT dispatch_no from pending_settlement_business where  bill_id =    #{id}
+
+    </select>
+    <select id="selectPendingSettlementBusinessByNo"
+            resultMap="PendingSettlementBusinessResult">
+        <include refid="selectPendingSettlementBusinessVo"/>
+        where dispatch_no = #{dispatchNo}
 
     </select>
 
@@ -521,6 +531,11 @@
             #{item}
         </foreach>
     </update>
+    <update id="updatePendingSettlementBusinessByBillId">
+          UPDATE pending_settlement_business set bill_name = #{billName}
+          where bill_id = #{id}
+
+    </update>
 
     <!--鍒犻櫎-->
     <delete id="deletePendingSettlementBusinessById" parameterType="Integer">
@@ -532,5 +547,9 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="cancelRelevancy">
+         UPDATE pending_settlement_business set bill_id = null ,bill_name = null,is_create = 0
+         where id = #{id}
+    </delete>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0