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/TmsConsignorMapper.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsConsignorMapper.xml b/tms/src/main/resources/mapper/tms/TmsConsignorMapper.xml
index 6ce984a..d137968 100644
--- a/tms/src/main/resources/mapper/tms/TmsConsignorMapper.xml
+++ b/tms/src/main/resources/mapper/tms/TmsConsignorMapper.xml
@@ -30,10 +30,11 @@
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="regionLabel" column="region_label" />
+ <result property="electronicFenceRange" column="electronic_fence_range" />
</resultMap>
<sql id="selectTmsConsignorVo">
- select thisTab.id, thisTab.consignor_code, thisTab.consignor_name, thisTab.customer_id, thisTab.customer_name, thisTab.customer_sys_code, thisTab.consignor_type, thisTab.contact_name, thisTab.contact_phone, thisTab.contact_email, thisTab.country_id, thisTab.province_id, thisTab.city_id, thisTab.district_id, thisTab.street_id, thisTab.address_detail, thisTab.dispatch_transport_area, thisTab.map_location, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.region_label from tms_consignor AS thisTab
+ select thisTab.id, thisTab.consignor_code, thisTab.consignor_name, thisTab.customer_id, thisTab.customer_name, thisTab.customer_sys_code, thisTab.consignor_type, thisTab.contact_name, thisTab.contact_phone, thisTab.contact_email, thisTab.country_id, thisTab.province_id, thisTab.city_id, thisTab.district_id, thisTab.street_id, thisTab.address_detail, thisTab.dispatch_transport_area, thisTab.map_location, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.remark, thisTab.region_label ,thisTab.electronic_fence_range from tms_consignor AS thisTab
</sql>
<sql id="selectTmsConsignorVoCount">
select count(0) from tms_consignor as thisTab
@@ -47,11 +48,19 @@
<if test="customerSysCode != null and customerSysCode != ''"> and thisTab.customer_sys_code = #{customerSysCode}</if>
<if test="consignorType != null "> and thisTab.consignor_type = #{consignorType}</if>
<if test="contactName != null and contactName != ''"> and thisTab.contact_name like concat('%', #{contactName}, '%')</if>
+ <if test="contactPhone != null and contactPhone != ''"> and thisTab.contact_phone = #{contactPhone}</if>
+ <if test="contactEmail != null and contactEmail != ''"> and thisTab.contact_email = #{contactEmail}</if>
+ <if test="countryId != null and countryId != ''"> and thisTab.country_id = #{countryId}</if>
+ <if test="provinceId != null and provinceId != ''"> and thisTab.province_id = #{provinceId}</if>
+ <if test="cityId != null and cityId != ''"> and thisTab.city_id = #{cityId}</if>
+ <if test="districtId != null and districtId != ''"> and thisTab.district_id = #{districtId}</if>
+ <if test="streetId != null and streetId != ''"> and thisTab.street_id = #{streetId}</if>
+ <if test="addressDetail != null and addressDetail != ''"> and thisTab.address_detail = #{addressDetail}</if>
<if test="dispatchTransportArea != null and dispatchTransportArea != ''"> and thisTab.dispatch_transport_area = #{dispatchTransportArea}</if>
+ <if test="mapLocation != null and mapLocation != ''"> and thisTab.map_location = #{mapLocation}</if>
<if test="status != null "> and thisTab.status = #{status}</if>
- <if test="updateBy != null and updateBy != ''"> and thisTab.update_by = #{updateBy}</if>
- <if test="updateTime != null "> and thisTab.update_time = #{updateTime}</if>
<if test="regionLabel != null and regionLabel != ''"> and thisTab.region_label = #{regionLabel}</if>
+ <if test="electronicFenceRange != null "> and thisTab.electronic_fence_range = #{electronicFenceRange}</if>
</sql>
<!--鏌ヨ-->
@@ -103,6 +112,7 @@
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="regionLabel != null">region_label,</if>
+ <if test="electronicFenceRange != null">electronic_fence_range,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="consignorCode != null and consignorCode != ''">#{consignorCode},</if>
@@ -129,17 +139,18 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="regionLabel != null">#{regionLabel},</if>
+ <if test="electronicFenceRange != null">#{electronicFenceRange},</if>
</trim>
</insert>
<insert id="insertTmsConsignorBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into tms_consignor
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,consignor_code,consignor_name,customer_id,customer_name,customer_sys_code,consignor_type,contact_name,contact_phone,contact_email,country_id,province_id,city_id,district_id,street_id,address_detail,dispatch_transport_area,map_location,status,create_by,create_time,update_by,update_time,remark,region_label,
+ id,consignor_code,consignor_name,customer_id,customer_name,customer_sys_code,consignor_type,contact_name,contact_phone,contact_email,country_id,province_id,city_id,district_id,street_id,address_detail,dispatch_transport_area,map_location,status,create_by,create_time,update_by,update_time,remark,region_label,electronic_fence_range
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{item.consignorCode},#{item.consignorName},#{item.customerId},#{item.customerName},#{item.customerSysCode},#{item.consignorType},#{item.contactName},#{item.contactPhone},#{item.contactEmail},#{item.countryId},#{item.provinceId},#{item.cityId},#{item.districtId},#{item.streetId},#{item.addressDetail},#{item.dispatchTransportArea},#{item.mapLocation},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.regionLabel},
+ #{item.id},#{item.consignorCode},#{item.consignorName},#{item.customerId},#{item.customerName},#{item.customerSysCode},#{item.consignorType},#{item.contactName},#{item.contactPhone},#{item.contactEmail},#{item.countryId},#{item.provinceId},#{item.cityId},#{item.districtId},#{item.streetId},#{item.addressDetail},#{item.dispatchTransportArea},#{item.mapLocation},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.remark},#{item.regionLabel},#{item.electronicFenceRange},
</trim>
</foreach>
</insert>
@@ -172,6 +183,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="regionLabel != null">region_label = #{regionLabel},</if>
+ <if test="electronicFenceRange != null">electronic_fence_range = #{electronicFenceRange},</if>
</trim>
where id = #{id}
</update>
@@ -204,6 +216,7 @@
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
<if test="item.regionLabel != null">region_label = #{item.regionLabel},</if>
+ <if test="item.electronicFenceRange != null">electronic_fence_range = #{item.electronicFenceRange},</if>
</trim>
where id = #{item.id}
</foreach>
--
Gitblit v1.8.0