From d457a0f31290ba12273a51e75f6c2cc714659efc Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期四, 27 十一月 2025 13:26:07 +0800
Subject: [PATCH] 提交
---
tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml b/tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml
index 71b240b..fdf7c05 100644
--- a/tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsQuoteDetailMapper.xml
@@ -28,10 +28,13 @@
<result property="updateBy" column="update_by" />
<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" />
</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 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 from tms_quote_detail AS thisTab
</sql>
<sql id="selectTmsQuoteDetailVoCount">
select count(0) from tms_quote_detail as thisTab
@@ -55,6 +58,9 @@
<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="planType != null "> and thisTab.plan_type = #{planType}</if>
+ <if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
+ <if test="currency != null "> and thisTab.currency = #{currency}</if>
</sql>
<!--鏌ヨ-->
@@ -78,7 +84,7 @@
AND d.vehicle_type = #{vehicleType}
WHERE p.id <> #{quotePlanId}
- AND p.customer_id = #{customerId}
+ AND p.customer_id = #{customerId} and d.plan_type = #{planType}
<if test="id != '' and id != null">
d.id <> #{id}
</if>
@@ -117,6 +123,9 @@
<if test="updateBy != null">update_by,</if>
<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>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemCode != null and systemCode != ''">#{systemCode},</if>
@@ -141,17 +150,20 @@
<if test="updateBy != null">#{updateBy},</if>
<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>
</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,
+ 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,
</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.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},
</trim>
</foreach>
</insert>
@@ -182,6 +194,9 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<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>
</trim>
where id = #{id}
</update>
@@ -212,6 +227,9 @@
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<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>
</trim>
where id = #{item.id}
</foreach>
--
Gitblit v1.8.0