From 3974fad5d836431e417e99220cc07bb5b0aba331 Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 08 十二月 2025 14:16:16 +0800
Subject: [PATCH] 提交
---
tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml | 84 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 5 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml b/tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml
index 5b25ae1..fadccea 100644
--- a/tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml
@@ -29,10 +29,22 @@
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="planType" column="plan_type" />
+ <result property="customerId" column="customer_id" />
+ <result property="currency" column="currency" />
+ <result property="taxRate" column="tax_rate" />
+ <result property="isSegmentedInvoice" column="is_segmented_invoice" />
+ <result property="segment1FreightQuote" column="segment1_freight_quote" />
+ <result property="segment1Currency" column="segment1_currency" />
+ <result property="segment1TaxRate" column="segment1_tax_rate" />
+ <result property="segment2FreightQuote" column="segment2_freight_quote" />
+ <result property="segment2Currency" column="segment2_currency" />
+ <result property="segment2TaxRate" column="segment2_tax_rate" />
+ <result property="totalFreightCny" column="total_freight_cny" />
+ <result property="totalFreightHkd" column="total_freight_hkd" />
</resultMap>
<sql id="selectTmsQuoteDetailVo">
- select thisTab.id, thisTab.system_code, thisTab.quote_plan_id, thisTab.quote_plan_code, thisTab.vehicle_provider_id, thisTab.vehicle_provider_name, thisTab.transport_route, thisTab.start_region_code, thisTab.start_region, thisTab.start_warehouse, thisTab.end_region_code, thisTab.end_region, thisTab.end_warehouse, thisTab.vehicle_type, thisTab.transport_mode, thisTab.route_type, thisTab.freight_price, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark,thisTab.plan_type from tms_quote_detail AS thisTab
+ select thisTab.id, thisTab.system_code, thisTab.quote_plan_id, thisTab.quote_plan_code, thisTab.vehicle_provider_id, thisTab.vehicle_provider_name, thisTab.transport_route, thisTab.start_region_code, thisTab.start_region, thisTab.start_warehouse, thisTab.end_region_code, thisTab.end_region, thisTab.end_warehouse, thisTab.vehicle_type, thisTab.transport_mode, thisTab.route_type, thisTab.freight_price, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark,thisTab.plan_type, thisTab.customer_id , thisTab.currency, thisTab.tax_rate, thisTab.is_segmented_invoice, thisTab.segment1_freight_quote, thisTab.segment1_currency, thisTab.segment1_tax_rate, thisTab.segment2_freight_quote, thisTab.segment2_currency, thisTab.segment2_tax_rate, thisTab.total_freight_cny, thisTab.total_freight_hkd from tms_quote_detail AS thisTab
</sql>
<sql id="selectTmsQuoteDetailVoCount">
select count(0) from tms_quote_detail as thisTab
@@ -51,12 +63,25 @@
<if test="endRegionCode != null and endRegionCode != ''"> and thisTab.end_region_code = #{endRegionCode}</if>
<if test="endRegion != null and endRegion != ''"> and thisTab.end_region = #{endRegion}</if>
<if test="endWarehouse != null "> and thisTab.end_warehouse = #{endWarehouse}</if>
- <if test="vehicleType != null "> and thisTab.vehicle_type = #{vehicleType}</if>
+ <if test="vehicleType != null and vehicleType != ''"> and thisTab.vehicle_type = #{vehicleType}</if>
<if test="transportMode != null "> and thisTab.transport_mode = #{transportMode}</if>
<if test="routeType != null "> and thisTab.route_type = #{routeType}</if>
<if test="freightPrice != null "> and thisTab.freight_price = #{freightPrice}</if>
- <if test="status != null "> and thisTab.status = #{status}</if>
+ <if test="status != null and status != ''"> and thisTab.status = #{status}</if>
<if test="planType != null "> and thisTab.plan_type = #{planType}</if>
+ <if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
+ <if test="currency != null and currency != ''"> and thisTab.currency = #{currency}</if>
+ <if test="taxRate != null "> and thisTab.tax_rate = #{taxRate}</if>
+ <if test="isSegmentedInvoice != null "> and thisTab.is_segmented_invoice = #{isSegmentedInvoice}</if>
+ <if test="segment1FreightQuote != null "> and thisTab.segment1_freight_quote = #{segment1FreightQuote}</if>
+ <if test="segment1Currency != null and segment1Currency != ''"> and thisTab.segment1_currency = #{segment1Currency}</if>
+ <if test="segment1TaxRate != null "> and thisTab.segment1_tax_rate = #{segment1TaxRate}</if>
+ <if test="segment2FreightQuote != null "> and thisTab.segment2_freight_quote = #{segment2FreightQuote}</if>
+ <if test="segment2Currency != null and segment2Currency != ''"> and thisTab.segment2_currency = #{segment2Currency}</if>
+ <if test="segment2TaxRate != null "> and thisTab.segment2_tax_rate = #{segment2TaxRate}</if>
+ <if test="totalFreightCny != null "> and thisTab.total_freight_cny = #{totalFreightCny}</if>
+ <if test="totalFreightHkd != null "> and thisTab.total_freight_hkd = #{totalFreightHkd}</if>
+
</sql>
<!--鏌ヨ-->
@@ -120,6 +145,18 @@
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="planType != null">plan_type,</if>
+ <if test="customerId != null">customer_id,</if>
+ <if test="currency != null">currency,</if>
+ <if test="taxRate != null">tax_rate,</if>
+ <if test="isSegmentedInvoice != null">is_segmented_invoice,</if>
+ <if test="segment1FreightQuote != null">segment1_freight_quote,</if>
+ <if test="segment1Currency != null">segment1_currency,</if>
+ <if test="segment1TaxRate != null">segment1_tax_rate,</if>
+ <if test="segment2FreightQuote != null">segment2_freight_quote,</if>
+ <if test="segment2Currency != null">segment2_currency,</if>
+ <if test="segment2TaxRate != null">segment2_tax_rate,</if>
+ <if test="totalFreightCny != null">total_freight_cny,</if>
+ <if test="totalFreightHkd != null">total_freight_hkd,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemCode != null and systemCode != ''">#{systemCode},</if>
@@ -145,17 +182,29 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="planType != null">#{planType},</if>
+ <if test="customerId != null">#{customerId},</if>
+ <if test="currency != null">#{currency},</if>
+ <if test="taxRate != null">#{taxRate},</if>
+ <if test="isSegmentedInvoice != null">#{isSegmentedInvoice},</if>
+ <if test="segment1FreightQuote != null">#{segment1FreightQuote},</if>
+ <if test="segment1Currency != null">#{segment1Currency},</if>
+ <if test="segment1TaxRate != null">#{segment1TaxRate},</if>
+ <if test="segment2FreightQuote != null">#{segment2FreightQuote},</if>
+ <if test="segment2Currency != null">#{segment2Currency},</if>
+ <if test="segment2TaxRate != null">#{segment2TaxRate},</if>
+ <if test="totalFreightCny != null">#{totalFreightCny},</if>
+ <if test="totalFreightHkd != null">#{totalFreightHkd},</if>
</trim>
</insert>
<insert id="insertTmsQuoteDetailBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_quote_detail
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,system_code,quote_plan_id,quote_plan_code,vehicle_provider_id,vehicle_provider_name,transport_route,start_region_code,start_region,start_warehouse,end_region_code,end_region,end_warehouse,vehicle_type,transport_mode,route_type,freight_price,status,create_by,create_time,update_by,update_time,remark,plan_type,
+ id,system_code,quote_plan_id,quote_plan_code,vehicle_provider_id,vehicle_provider_name,transport_route,start_region_code,start_region,start_warehouse,end_region_code,end_region,end_warehouse,vehicle_type,transport_mode,route_type,freight_price,status,create_by,create_time,update_by,update_time,remark,plan_type,customer_id,currency,tax_rate,is_segmented_invoice,segment1_freight_quote,segment1_currency,segment1_tax_rate,segment2_freight_quote,segment2_currency,segment2_tax_rate,total_freight_cny,total_freight_hkd,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.systemCode},#{item.quotePlanId},#{item.quotePlanCode},#{item.vehicleProviderId},#{item.vehicleProviderName},#{item.transportRoute},#{item.startRegionCode},#{item.startRegion},#{item.startWarehouse},#{item.endRegionCode},#{item.endRegion},#{item.endWarehouse},#{item.vehicleType},#{item.transportMode},#{item.routeType},#{item.freightPrice},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.planType},
+ #{item.id},#{item.systemCode},#{item.quotePlanId},#{item.quotePlanCode},#{item.vehicleProviderId},#{item.vehicleProviderName},#{item.transportRoute},#{item.startRegionCode},#{item.startRegion},#{item.startWarehouse},#{item.endRegionCode},#{item.endRegion},#{item.endWarehouse},#{item.vehicleType},#{item.transportMode},#{item.routeType},#{item.freightPrice},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.planType},#{item.customerId},#{item.currency},#{item.taxRate},#{item.isSegmentedInvoice},#{item.segment1FreightQuote},#{item.segment1Currency},#{item.segment1TaxRate},#{item.segment2FreightQuote},#{item.segment2Currency},#{item.segment2TaxRate},#{item.totalFreightCny},#{item.totalFreightHkd},
</trim>
</foreach>
</insert>
@@ -187,6 +236,18 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="planType != null">plan_type = #{planType},</if>
+ <if test="customerId != null">customer_id = #{customerId},</if>
+ <if test="currency != null">currency = #{currency},</if>
+ <if test="taxRate != null">tax_rate = #{taxRate},</if>
+ <if test="isSegmentedInvoice != null">is_segmented_invoice = #{isSegmentedInvoice},</if>
+ <if test="segment1FreightQuote != null">segment1_freight_quote = #{segment1FreightQuote},</if>
+ <if test="segment1Currency != null">segment1_currency = #{segment1Currency},</if>
+ <if test="segment1TaxRate != null">segment1_tax_rate = #{segment1TaxRate},</if>
+ <if test="segment2FreightQuote != null">segment2_freight_quote = #{segment2FreightQuote},</if>
+ <if test="segment2Currency != null">segment2_currency = #{segment2Currency},</if>
+ <if test="segment2TaxRate != null">segment2_tax_rate = #{segment2TaxRate},</if>
+ <if test="totalFreightCny != null">total_freight_cny = #{totalFreightCny},</if>
+ <if test="totalFreightHkd != null">total_freight_hkd = #{totalFreightHkd},</if>
</trim>
where id = #{id}
</update>
@@ -218,6 +279,19 @@
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
<if test="item.planType != null">plan_type = #{item.planType},</if>
+ <if test="item.customerId != null">customer_id = #{item.customerId},</if>
+ <if test="item.currency != null">currency = #{item.currency},</if>
+ <if test="item.taxRate != null">tax_rate = #{item.taxRate},</if>
+ <if test="item.isSegmentedInvoice != null">is_segmented_invoice = #{item.isSegmentedInvoice},</if>
+ <if test="item.segment1FreightQuote != null">segment1_freight_quote = #{item.segment1FreightQuote},</if>
+ <if test="item.segment1Currency != null">segment1_currency = #{item.segment1Currency},</if>
+ <if test="item.segment1TaxRate != null">segment1_tax_rate = #{item.segment1TaxRate},</if>
+ <if test="item.segment2FreightQuote != null">segment2_freight_quote = #{item.segment2FreightQuote},</if>
+ <if test="item.segment2Currency != null">segment2_currency = #{item.segment2Currency},</if>
+ <if test="item.segment2TaxRate != null">segment2_tax_rate = #{item.segment2TaxRate},</if>
+ <if test="item.totalFreightCny != null">total_freight_cny = #{item.totalFreightCny},</if>
+ <if test="item.totalFreightHkd != null">total_freight_hkd = #{item.totalFreightHkd},</if>
+
</trim>
where id = #{item.id}
</foreach>
--
Gitblit v1.8.0