From 90c4fbd121dd18013e333346c99bbc9844cd6fec Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期一, 08 十二月 2025 13:24:16 +0800
Subject: [PATCH] 提交
---
tms/src/main/resources/mapper/tms/TmsPlanOrderMapper.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsPlanOrderMapper.xml b/tms/src/main/resources/mapper/tms/TmsPlanOrderMapper.xml
index f50c017..9fbaf30 100644
--- a/tms/src/main/resources/mapper/tms/TmsPlanOrderMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsPlanOrderMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tms.mapper.TmsPlanOrderMapper">
<resultMap type="com.ruoyi.tms.domain.TmsPlanOrder" id="TmsPlanOrderResult">
@@ -9,23 +9,29 @@
<result property="planCode" column="plan_code" />
<result property="planName" column="plan_name" />
<result property="customerId" column="customer_id" />
+ <result property="customerName" column="customer_name" />
<result property="projectId" column="project_id" />
<result property="contractId" column="contract_id" />
+ <result property="projectName" column="project_name" />
<result property="orderType" column="order_type" />
<result property="signType" column="sign_type" />
<result property="vehicleProviderId" column="vehicle_provider_id" />
+ <result property="contractName" column="contract_name" />
<result property="isUrgent" column="is_urgent" />
<result property="shipperId" column="shipper_id" />
<result property="shipperMobile" column="shipper_mobile" />
+ <result property="vehicleProviderName" column="vehicle_provider_name" />
<result property="shipperAddress" column="shipper_address" />
<result property="shipperRegionCode" column="shipper_region_code" />
<result property="receiverId" column="receiver_id" />
+ <result property="shipperName" column="shipper_name" />
<result property="receiverMobile" column="receiver_mobile" />
<result property="receiverAddress" column="receiver_address" />
<result property="receiverRegionCode" column="receiver_region_code" />
<result property="vehicleTypeIds" column="vehicle_type_ids" />
<result property="planStartTime" column="plan_start_time" />
<result property="planEndTime" column="plan_end_time" />
+ <result property="receiverName" column="receiver_name" />
<result property="planTotalCount" column="plan_total_count" />
<result property="allowOverDispatch" column="allow_over_dispatch" />
<result property="requiredLoadTime" column="required_load_time" />
@@ -41,7 +47,7 @@
</resultMap>
<sql id="selectTmsPlanOrderVo">
- select thisTab.id, thisTab.plan_code, thisTab.plan_name, thisTab.customer_id, thisTab.project_id, thisTab.contract_id, thisTab.order_type, thisTab.sign_type, thisTab.vehicle_provider_id, thisTab.is_urgent, thisTab.shipper_id, thisTab.shipper_mobile, thisTab.shipper_address, thisTab.shipper_region_code, thisTab.receiver_id, thisTab.receiver_mobile, thisTab.receiver_address, thisTab.receiver_region_code, thisTab.vehicle_type_ids, thisTab.plan_start_time, thisTab.plan_end_time, thisTab.plan_total_count, thisTab.allow_over_dispatch, thisTab.required_load_time, thisTab.required_unload_time, thisTab.transport_type, thisTab.load_method, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark from tms_plan_order AS thisTab
+ select thisTab.id, thisTab.plan_code, thisTab.plan_name, thisTab.customer_id, thisTab.customer_name, thisTab.project_id, thisTab.contract_id, thisTab.project_name, thisTab.order_type, thisTab.sign_type, thisTab.vehicle_provider_id, thisTab.contract_name, thisTab.is_urgent, thisTab.shipper_id, thisTab.shipper_mobile, thisTab.vehicle_provider_name, thisTab.shipper_address, thisTab.shipper_region_code, thisTab.receiver_id, thisTab.shipper_name, thisTab.receiver_mobile, thisTab.receiver_address, thisTab.receiver_region_code, thisTab.vehicle_type_ids, thisTab.plan_start_time, thisTab.plan_end_time, thisTab.receiver_name, thisTab.plan_total_count, thisTab.allow_over_dispatch, thisTab.required_load_time, thisTab.required_unload_time, thisTab.transport_type, thisTab.load_method, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark from tms_plan_order AS thisTab
</sql>
<sql id="selectTmsPlanOrderVoCount">
select count(0) from tms_plan_order as thisTab
@@ -51,14 +57,20 @@
<if test="planCode != null and planCode != ''"> and thisTab.plan_code = #{planCode}</if>
<if test="planName != null and planName != ''"> and thisTab.plan_name like concat('%', #{planName}, '%')</if>
<if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
+ <if test="customerName != null and customerName != ''"> and thisTab.customer_name like concat('%', #{customerName}, '%')</if>
<if test="projectId != null "> and thisTab.project_id = #{projectId}</if>
<if test="contractId != null "> and thisTab.contract_id = #{contractId}</if>
+ <if test="projectName != null and projectName != ''"> and thisTab.project_name like concat('%', #{projectName}, '%')</if>
<if test="orderType != null "> and thisTab.order_type = #{orderType}</if>
<if test="signType != null "> and thisTab.sign_type = #{signType}</if>
<if test="vehicleProviderId != null "> and thisTab.vehicle_provider_id = #{vehicleProviderId}</if>
+ <if test="contractName != null and contractName != ''"> and thisTab.contract_name like concat('%', #{contractName}, '%')</if>
<if test="isUrgent != null "> and thisTab.is_urgent = #{isUrgent}</if>
<if test="shipperId != null "> and thisTab.shipper_id = #{shipperId}</if>
+ <if test="vehicleProviderName != null and vehicleProviderName != ''"> and thisTab.vehicle_provider_name like concat('%', #{vehicleProviderName}, '%')</if>
<if test="receiverId != null "> and thisTab.receiver_id = #{receiverId}</if>
+ <if test="shipperName != null and shipperName != ''"> and thisTab.shipper_name like concat('%', #{shipperName}, '%')</if>
+ <if test="receiverName != null and receiverName != ''"> and thisTab.receiver_name like concat('%', #{receiverName}, '%')</if>
<if test="status != null "> and thisTab.status = #{status}</if>
</sql>
@@ -90,23 +102,29 @@
<if test="planCode != null and planCode != ''">plan_code,</if>
<if test="planName != null and planName != ''">plan_name,</if>
<if test="customerId != null">customer_id,</if>
+ <if test="customerName != null">customer_name,</if>
<if test="projectId != null">project_id,</if>
<if test="contractId != null">contract_id,</if>
+ <if test="projectName != null">project_name,</if>
<if test="orderType != null">order_type,</if>
<if test="signType != null">sign_type,</if>
<if test="vehicleProviderId != null">vehicle_provider_id,</if>
+ <if test="contractName != null">contract_name,</if>
<if test="isUrgent != null">is_urgent,</if>
<if test="shipperId != null">shipper_id,</if>
<if test="shipperMobile != null">shipper_mobile,</if>
+ <if test="vehicleProviderName != null">vehicle_provider_name,</if>
<if test="shipperAddress != null">shipper_address,</if>
<if test="shipperRegionCode != null">shipper_region_code,</if>
<if test="receiverId != null">receiver_id,</if>
+ <if test="shipperName != null">shipper_name,</if>
<if test="receiverMobile != null">receiver_mobile,</if>
<if test="receiverAddress != null">receiver_address,</if>
<if test="receiverRegionCode != null">receiver_region_code,</if>
<if test="vehicleTypeIds != null">vehicle_type_ids,</if>
<if test="planStartTime != null">plan_start_time,</if>
<if test="planEndTime != null">plan_end_time,</if>
+ <if test="receiverName != null">receiver_name,</if>
<if test="planTotalCount != null">plan_total_count,</if>
<if test="allowOverDispatch != null">allow_over_dispatch,</if>
<if test="requiredLoadTime != null">required_load_time,</if>
@@ -119,28 +137,34 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="planCode != null and planCode != ''">#{planCode},</if>
<if test="planName != null and planName != ''">#{planName},</if>
<if test="customerId != null">#{customerId},</if>
+ <if test="customerName != null">#{customerName},</if>
<if test="projectId != null">#{projectId},</if>
<if test="contractId != null">#{contractId},</if>
+ <if test="projectName != null">#{projectName},</if>
<if test="orderType != null">#{orderType},</if>
<if test="signType != null">#{signType},</if>
<if test="vehicleProviderId != null">#{vehicleProviderId},</if>
+ <if test="contractName != null">#{contractName},</if>
<if test="isUrgent != null">#{isUrgent},</if>
<if test="shipperId != null">#{shipperId},</if>
<if test="shipperMobile != null">#{shipperMobile},</if>
+ <if test="vehicleProviderName != null">#{vehicleProviderName},</if>
<if test="shipperAddress != null">#{shipperAddress},</if>
<if test="shipperRegionCode != null">#{shipperRegionCode},</if>
<if test="receiverId != null">#{receiverId},</if>
+ <if test="shipperName != null">#{shipperName},</if>
<if test="receiverMobile != null">#{receiverMobile},</if>
<if test="receiverAddress != null">#{receiverAddress},</if>
<if test="receiverRegionCode != null">#{receiverRegionCode},</if>
<if test="vehicleTypeIds != null">#{vehicleTypeIds},</if>
<if test="planStartTime != null">#{planStartTime},</if>
<if test="planEndTime != null">#{planEndTime},</if>
+ <if test="receiverName != null">#{receiverName},</if>
<if test="planTotalCount != null">#{planTotalCount},</if>
<if test="allowOverDispatch != null">#{allowOverDispatch},</if>
<if test="requiredLoadTime != null">#{requiredLoadTime},</if>
@@ -153,17 +177,17 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
- </trim>
+ </trim>
</insert>
<insert id="insertTmsPlanOrderBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_plan_order
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,plan_code,plan_name,customer_id,project_id,contract_id,order_type,sign_type,vehicle_provider_id,is_urgent,shipper_id,shipper_mobile,shipper_address,shipper_region_code,receiver_id,receiver_mobile,receiver_address,receiver_region_code,vehicle_type_ids,plan_start_time,plan_end_time,plan_total_count,allow_over_dispatch,required_load_time,required_unload_time,transport_type,load_method,status,create_by,create_time,update_by,update_time,remark,
+ id,plan_code,plan_name,customer_id,customer_name,project_id,contract_id,project_name,order_type,sign_type,vehicle_provider_id,contract_name,is_urgent,shipper_id,shipper_mobile,vehicle_provider_name,shipper_address,shipper_region_code,receiver_id,shipper_name,receiver_mobile,receiver_address,receiver_region_code,vehicle_type_ids,plan_start_time,plan_end_time,receiver_name,plan_total_count,allow_over_dispatch,required_load_time,required_unload_time,transport_type,load_method,status,create_by,create_time,update_by,update_time,remark,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.planCode},#{item.planName},#{item.customerId},#{item.projectId},#{item.contractId},#{item.orderType},#{item.signType},#{item.vehicleProviderId},#{item.isUrgent},#{item.shipperId},#{item.shipperMobile},#{item.shipperAddress},#{item.shipperRegionCode},#{item.receiverId},#{item.receiverMobile},#{item.receiverAddress},#{item.receiverRegionCode},#{item.vehicleTypeIds},#{item.planStartTime},#{item.planEndTime},#{item.planTotalCount},#{item.allowOverDispatch},#{item.requiredLoadTime},#{item.requiredUnloadTime},#{item.transportType},#{item.loadMethod},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},
+ #{item.id},#{item.planCode},#{item.planName},#{item.customerId},#{item.customerName},#{item.projectId},#{item.contractId},#{item.projectName},#{item.orderType},#{item.signType},#{item.vehicleProviderId},#{item.contractName},#{item.isUrgent},#{item.shipperId},#{item.shipperMobile},#{item.vehicleProviderName},#{item.shipperAddress},#{item.shipperRegionCode},#{item.receiverId},#{item.shipperName},#{item.receiverMobile},#{item.receiverAddress},#{item.receiverRegionCode},#{item.vehicleTypeIds},#{item.planStartTime},#{item.planEndTime},#{item.receiverName},#{item.planTotalCount},#{item.allowOverDispatch},#{item.requiredLoadTime},#{item.requiredUnloadTime},#{item.transportType},#{item.loadMethod},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},
</trim>
</foreach>
</insert>
@@ -175,23 +199,29 @@
<if test="planCode != null and planCode != ''">plan_code = #{planCode},</if>
<if test="planName != null and planName != ''">plan_name = #{planName},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
+ <if test="customerName != null">customer_name = #{customerName},</if>
<if test="projectId != null">project_id = #{projectId},</if>
<if test="contractId != null">contract_id = #{contractId},</if>
+ <if test="projectName != null">project_name = #{projectName},</if>
<if test="orderType != null">order_type = #{orderType},</if>
<if test="signType != null">sign_type = #{signType},</if>
<if test="vehicleProviderId != null">vehicle_provider_id = #{vehicleProviderId},</if>
+ <if test="contractName != null">contract_name = #{contractName},</if>
<if test="isUrgent != null">is_urgent = #{isUrgent},</if>
<if test="shipperId != null">shipper_id = #{shipperId},</if>
<if test="shipperMobile != null">shipper_mobile = #{shipperMobile},</if>
+ <if test="vehicleProviderName != null">vehicle_provider_name = #{vehicleProviderName},</if>
<if test="shipperAddress != null">shipper_address = #{shipperAddress},</if>
<if test="shipperRegionCode != null">shipper_region_code = #{shipperRegionCode},</if>
<if test="receiverId != null">receiver_id = #{receiverId},</if>
+ <if test="shipperName != null">shipper_name = #{shipperName},</if>
<if test="receiverMobile != null">receiver_mobile = #{receiverMobile},</if>
<if test="receiverAddress != null">receiver_address = #{receiverAddress},</if>
<if test="receiverRegionCode != null">receiver_region_code = #{receiverRegionCode},</if>
<if test="vehicleTypeIds != null">vehicle_type_ids = #{vehicleTypeIds},</if>
<if test="planStartTime != null">plan_start_time = #{planStartTime},</if>
<if test="planEndTime != null">plan_end_time = #{planEndTime},</if>
+ <if test="receiverName != null">receiver_name = #{receiverName},</if>
<if test="planTotalCount != null">plan_total_count = #{planTotalCount},</if>
<if test="allowOverDispatch != null">allow_over_dispatch = #{allowOverDispatch},</if>
<if test="requiredLoadTime != null">required_load_time = #{requiredLoadTime},</if>
@@ -215,23 +245,29 @@
<if test="item.planCode != null and item.planCode != ''">plan_code = #{item.planCode},</if>
<if test="item.planName != null and item.planName != ''">plan_name = #{item.planName},</if>
<if test="item.customerId != null">customer_id = #{item.customerId},</if>
+ <if test="item.customerName != null">customer_name = #{item.customerName},</if>
<if test="item.projectId != null">project_id = #{item.projectId},</if>
<if test="item.contractId != null">contract_id = #{item.contractId},</if>
+ <if test="item.projectName != null">project_name = #{item.projectName},</if>
<if test="item.orderType != null">order_type = #{item.orderType},</if>
<if test="item.signType != null">sign_type = #{item.signType},</if>
<if test="item.vehicleProviderId != null">vehicle_provider_id = #{item.vehicleProviderId},</if>
+ <if test="item.contractName != null">contract_name = #{item.contractName},</if>
<if test="item.isUrgent != null">is_urgent = #{item.isUrgent},</if>
<if test="item.shipperId != null">shipper_id = #{item.shipperId},</if>
<if test="item.shipperMobile != null">shipper_mobile = #{item.shipperMobile},</if>
+ <if test="item.vehicleProviderName != null">vehicle_provider_name = #{item.vehicleProviderName},</if>
<if test="item.shipperAddress != null">shipper_address = #{item.shipperAddress},</if>
<if test="item.shipperRegionCode != null">shipper_region_code = #{item.shipperRegionCode},</if>
<if test="item.receiverId != null">receiver_id = #{item.receiverId},</if>
+ <if test="item.shipperName != null">shipper_name = #{item.shipperName},</if>
<if test="item.receiverMobile != null">receiver_mobile = #{item.receiverMobile},</if>
<if test="item.receiverAddress != null">receiver_address = #{item.receiverAddress},</if>
<if test="item.receiverRegionCode != null">receiver_region_code = #{item.receiverRegionCode},</if>
<if test="item.vehicleTypeIds != null">vehicle_type_ids = #{item.vehicleTypeIds},</if>
<if test="item.planStartTime != null">plan_start_time = #{item.planStartTime},</if>
<if test="item.planEndTime != null">plan_end_time = #{item.planEndTime},</if>
+ <if test="item.receiverName != null">receiver_name = #{item.receiverName},</if>
<if test="item.planTotalCount != null">plan_total_count = #{item.planTotalCount},</if>
<if test="item.allowOverDispatch != null">allow_over_dispatch = #{item.allowOverDispatch},</if>
<if test="item.requiredLoadTime != null">required_load_time = #{item.requiredLoadTime},</if>
@@ -245,7 +281,7 @@
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
</trim>
- where id = #{item.id}
+ where id = #{item.id}
</foreach>
</update>
--
Gitblit v1.8.0