From f238bf7fdc77742736f7ca5bd8bd127b7dfd6b1a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 22 Apr 2024 18:13:50 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisQuoteDispArea.java    | 13 +++++----
 .../erp/emis/domain/EmisQuoteSendArea.java    | 13 +++++----
 .../mapper/EmisQuoteDispAreaMapper.xml        | 27 +++++++++++--------
 .../mapper/EmisQuoteSendAreaMapper.xml        | 27 +++++++++++--------
 4 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteDispArea.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteDispArea.java
index d047156d8..b28d29393 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteDispArea.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteDispArea.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisQuoteDispArea.java
  * @author linfso
- * @date 2024-01-12 08:40:03
+ * @date 2024-04-22 10:13:12
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 派件区域 实体类 </p>
  */
 
@@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel;
 import com.xdadan.erp.common.core.domain.BaseEntity;
 import com.xdadan.erp.common.core.domain.TreeEntity;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -25,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisQuoteDispArea
  * @Description 派件区域
  * @author linfso
- * @date 2024-01-12 08:40:03
+ * @date 2024-04-22 10:13:12
  */
- @Data
+@Data
 public class EmisQuoteDispArea extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -42,6 +43,8 @@ public class EmisQuoteDispArea extends BaseEntity
     private String useSiteCode;
     /* 区域站点列表 */
     private String areaSite;
+    /* area_site_code */
+    private String areaSiteCode;
     /* 区域站点列表 */
     private String areaSiteId;
     /* 费用类型 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java
index b2aced710..96e55c142 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuoteSendArea.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisQuoteSendArea.java
  * @author linfso
- * @date 2024-01-12 08:40:05
+ * @date 2024-04-22 10:10:59
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 寄件区域 实体类 </p>
  */
 
@@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel;
 import com.xdadan.erp.common.core.domain.BaseEntity;
 import com.xdadan.erp.common.core.domain.TreeEntity;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
 
@@ -25,9 +26,9 @@ import lombok.Data;
  * @ClassName EmisQuoteSendArea
  * @Description 寄件区域
  * @author linfso
- * @date 2024-01-12 08:40:05
+ * @date 2024-04-22 10:10:59
  */
- @Data
+@Data
 public class EmisQuoteSendArea extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -42,6 +43,8 @@ public class EmisQuoteSendArea extends BaseEntity
     private String useSiteCode;
     /* 区域站点列表 */
     private String areaSite;
+    /* area_site_code */
+    private String areaSiteCode;
     /* 区域站点列表 */
     private String areaSiteId;
     /* 费用类型 */
diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
index 9c9c9592b..f3e64ddf6 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml
@@ -1,15 +1,16 @@
 <?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.xdadan.erp.emis.mapper.EmisQuoteDispAreaMapper">
-    
+
     <resultMap type="EmisQuoteDispArea" id="EmisQuoteDispAreaResult">
         <result property="areaId"    column="area_id"    />
         <result property="areaName"    column="area_name"    />
         <result property="useSite"    column="use_site"    />
         <result property="useSiteCode"    column="use_site_code"    />
         <result property="areaSite"    column="area_site"    />
+        <result property="areaSiteCode"    column="area_site_code"    />
         <result property="areaSiteId"    column="area_site_id"    />
         <result property="feeType"    column="fee_type"    />
         <result property="areaType"    column="area_type"    />
@@ -27,17 +28,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisQuoteDispAreaVo">
-        select area_id, area_name, use_site, use_site_code, area_site, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_disp_area
+        select area_id, area_name, use_site, use_site_code, area_site, area_site_code, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_disp_area
     </sql>
 
     <select id="selectEmisQuoteDispAreaList" parameterType="EmisQuoteDispArea" resultMap="EmisQuoteDispAreaResult">
         <include refid="selectEmisQuoteDispAreaVo"/>
-        <where>  
+        <where>
             <if test="areaId != null "> and area_id = #{areaId}</if>
             <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
             <if test="useSite != null  and useSite != ''"> and use_site like concat('%', #{useSite}, '%')</if>
             <if test="useSiteCode != null  and useSiteCode != ''"> and use_site_code like concat('%', #{useSiteCode}, '%')</if>
             <if test="areaSite != null  and areaSite != ''"> and area_site like concat('%', #{areaSite}, '%')</if>
+            <if test="areaSiteCode != null  and areaSiteCode != ''"> and area_site_code like concat('%', #{areaSiteCode}, '%')</if>
             <if test="areaSiteId != null  and areaSiteId != ''"> and area_site_id like concat('%', #{areaSiteId}, '%')</if>
             <if test="feeType != null  and feeType != ''"> and fee_type like concat('%', #{feeType}, '%')</if>
             <if test="areaType != null  and areaType != ''"> and area_type like concat('%', #{areaType}, '%')</if>
@@ -55,13 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-  
+
     <select id="selectEmisQuoteDispAreaByAreaId" parameterType="Long" resultMap="EmisQuoteDispAreaResult">
-        select area_id, area_name, use_site, use_site_code, area_site, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select area_id, area_name, use_site, use_site_code, area_site, area_site_code, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_quote_disp_area a
         where a.area_id = #{areaId}
     </select>
-        
+
     <insert id="insertEmisQuoteDispArea" parameterType="EmisQuoteDispArea">
         insert into emis_quote_disp_area
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useSite != null and useSite != ''">use_site,</if>
             <if test="useSiteCode != null and useSiteCode != ''">use_site_code,</if>
             <if test="areaSite != null and areaSite != ''">area_site,</if>
+            <if test="areaSiteCode != null and areaSiteCode != ''">area_site_code,</if>
             <if test="areaSiteId != null and areaSiteId != ''">area_site_id,</if>
             <if test="feeType != null and feeType != ''">fee_type,</if>
             <if test="areaType != null and areaType != ''">area_type,</if>
@@ -84,13 +87,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="areaId != null">#{areaId},</if>
             <if test="areaName != null and areaName != ''">#{areaName},</if>
             <if test="useSite != null and useSite != ''">#{useSite},</if>
             <if test="useSiteCode != null and useSiteCode != ''">#{useSiteCode},</if>
             <if test="areaSite != null and areaSite != ''">#{areaSite},</if>
+            <if test="areaSiteCode != null and areaSiteCode != ''">#{areaSiteCode},</if>
             <if test="areaSiteId != null and areaSiteId != ''">#{areaSiteId},</if>
             <if test="feeType != null and feeType != ''">#{feeType},</if>
             <if test="areaType != null and areaType != ''">#{areaType},</if>
@@ -105,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisQuoteDispArea" parameterType="EmisQuoteDispArea">
@@ -115,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useSite != null and useSite != ''">use_site = #{useSite},</if>
             <if test="useSiteCode != null and useSiteCode != ''">use_site_code = #{useSiteCode},</if>
             <if test="areaSite != null and areaSite != ''">area_site = #{areaSite},</if>
+            <if test="areaSiteCode != null and areaSiteCode != ''">area_site_code = #{areaSiteCode},</if>
             <if test="areaSiteId != null and areaSiteId != ''">area_site_id = #{areaSiteId},</if>
             <if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
             <if test="areaType != null and areaType != ''">area_type = #{areaType},</if>
@@ -138,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisQuoteDispAreaByAreaIds" parameterType="String">
-        delete from emis_quote_disp_area where area_id in 
+        delete from emis_quote_disp_area where area_id in
         <foreach item="areaId" collection="array" open="(" separator="," close=")">
             #{areaId}
         </foreach>
diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
index bc635962e..b99de47a8 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml
@@ -1,15 +1,16 @@
 <?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.xdadan.erp.emis.mapper.EmisQuoteSendAreaMapper">
-    
+
     <resultMap type="EmisQuoteSendArea" id="EmisQuoteSendAreaResult">
         <result property="areaId"    column="area_id"    />
         <result property="areaName"    column="area_name"    />
         <result property="useSite"    column="use_site"    />
         <result property="useSiteCode"    column="use_site_code"    />
         <result property="areaSite"    column="area_site"    />
+        <result property="areaSiteCode"    column="area_site_code"    />
         <result property="areaSiteId"    column="area_site_id"    />
         <result property="feeType"    column="fee_type"    />
         <result property="areaType"    column="area_type"    />
@@ -27,17 +28,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisQuoteSendAreaVo">
-        select area_id, area_name, use_site, use_site_code, area_site, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_send_area
+        select area_id, area_name, use_site, use_site_code, area_site, area_site_code, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_send_area
     </sql>
 
     <select id="selectEmisQuoteSendAreaList" parameterType="EmisQuoteSendArea" resultMap="EmisQuoteSendAreaResult">
         <include refid="selectEmisQuoteSendAreaVo"/>
-        <where>  
+        <where>
             <if test="areaId != null "> and area_id = #{areaId}</if>
             <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
             <if test="useSite != null  and useSite != ''"> and use_site like concat('%', #{useSite}, '%')</if>
             <if test="useSiteCode != null  and useSiteCode != ''"> and use_site_code like concat('%', #{useSiteCode}, '%')</if>
             <if test="areaSite != null  and areaSite != ''"> and area_site like concat('%', #{areaSite}, '%')</if>
+            <if test="areaSiteCode != null  and areaSiteCode != ''"> and area_site_code like concat('%', #{areaSiteCode}, '%')</if>
             <if test="areaSiteId != null  and areaSiteId != ''"> and area_site_id like concat('%', #{areaSiteId}, '%')</if>
             <if test="feeType != null  and feeType != ''"> and fee_type like concat('%', #{feeType}, '%')</if>
             <if test="areaType != null  and areaType != ''"> and area_type like concat('%', #{areaType}, '%')</if>
@@ -55,13 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-  
+
     <select id="selectEmisQuoteSendAreaByAreaId" parameterType="Long" resultMap="EmisQuoteSendAreaResult">
-        select area_id, area_name, use_site, use_site_code, area_site, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select area_id, area_name, use_site, use_site_code, area_site, area_site_code, area_site_id, fee_type, area_type, sync, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_quote_send_area a
         where a.area_id = #{areaId}
     </select>
-        
+
     <insert id="insertEmisQuoteSendArea" parameterType="EmisQuoteSendArea">
         insert into emis_quote_send_area
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useSite != null and useSite != ''">use_site,</if>
             <if test="useSiteCode != null and useSiteCode != ''">use_site_code,</if>
             <if test="areaSite != null and areaSite != ''">area_site,</if>
+            <if test="areaSiteCode != null and areaSiteCode != ''">area_site_code,</if>
             <if test="areaSiteId != null and areaSiteId != ''">area_site_id,</if>
             <if test="feeType != null and feeType != ''">fee_type,</if>
             <if test="areaType != null and areaType != ''">area_type,</if>
@@ -84,13 +87,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="createSite != null and createSite != ''">create_site,</if>
             <if test="updateSite != null and updateSite != ''">update_site,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="areaId != null">#{areaId},</if>
             <if test="areaName != null and areaName != ''">#{areaName},</if>
             <if test="useSite != null and useSite != ''">#{useSite},</if>
             <if test="useSiteCode != null and useSiteCode != ''">#{useSiteCode},</if>
             <if test="areaSite != null and areaSite != ''">#{areaSite},</if>
+            <if test="areaSiteCode != null and areaSiteCode != ''">#{areaSiteCode},</if>
             <if test="areaSiteId != null and areaSiteId != ''">#{areaSiteId},</if>
             <if test="feeType != null and feeType != ''">#{feeType},</if>
             <if test="areaType != null and areaType != ''">#{areaType},</if>
@@ -105,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createSite != null and createSite != ''">#{createSite},</if>
             <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisQuoteSendArea" parameterType="EmisQuoteSendArea">
@@ -115,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useSite != null and useSite != ''">use_site = #{useSite},</if>
             <if test="useSiteCode != null and useSiteCode != ''">use_site_code = #{useSiteCode},</if>
             <if test="areaSite != null and areaSite != ''">area_site = #{areaSite},</if>
+            <if test="areaSiteCode != null and areaSiteCode != ''">area_site_code = #{areaSiteCode},</if>
             <if test="areaSiteId != null and areaSiteId != ''">area_site_id = #{areaSiteId},</if>
             <if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
             <if test="areaType != null and areaType != ''">area_type = #{areaType},</if>
@@ -138,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisQuoteSendAreaByAreaIds" parameterType="String">
-        delete from emis_quote_send_area where area_id in 
+        delete from emis_quote_send_area where area_id in
         <foreach item="areaId" collection="array" open="(" separator="," close=")">
             #{areaId}
         </foreach>