From 204a1d70d92fb0feb57174bbfa8463216cb74049 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 18 Apr 2024 16:16:03 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisSite.java   | 14 +++++++++-----
 .../main/resources/mapper/EmisSiteMapper.xml   | 18 ++++++++++++++----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
index 9707ba0fd..e374498cf 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisSite.java
  * @author linfso
- * @date 2024-04-17 04:46:08
+ * @date 2024-04-18 08:14:01
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 网点 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisSite
  * @Description 网点
  * @author linfso
- * @date 2024-04-17 04:46:08
+ * @date 2024-04-18 08:14:01
  */
 @Data
 public class EmisSite extends BaseEntity
@@ -51,6 +51,8 @@ public class EmisSite extends BaseEntity
     private String superiorFinanceCenterCode;
     /* 站点类型 */
     private String siteType;
+    /* 加盟类型 直营和加盟 */
+    private String scopeType;
     /* 类型 */
     private String defaultDestinationNameCode;
     /* 默认发件地 */
@@ -141,11 +143,11 @@ public class EmisSite extends BaseEntity
     private String stopDate;
     /* 是否允许代收 */
     private String blAllowAgentMoney;
-    /* 是否允许代付 */
+    /* 是否允许到付 */
     private String blAllowTopayment;
     /* 商品付款限额 */
     private String goodsPaymentLimited;
-    /* 派到付款限额 */
+    /* 到付款限额 */
     private String topaymentLimited;
     /* 是否收货 */
     private String blRec;
@@ -167,7 +169,7 @@ public class EmisSite extends BaseEntity
     private String blProjectclient;
     /* 是否vip站点 */
     private String blVipSite;
-    /* 是否派送站点 */
+    /* 是否派送自提 */
     private String blDispatchZt;
     /* 是否lillto账户 */
     private String blBilltoAccount;
@@ -259,6 +261,8 @@ public class EmisSite extends BaseEntity
     private String blNotDisp;
     /* 是否不允许现金 */
     private String blNotCashOut;
+    /* 状态 1-启用 0-停用 */
+    private String status;
     /* 创建网点 */
     private String createSite;
     /* 更新网点 */
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
index 01f63bf96..69bd5dfcb 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
@@ -14,6 +14,7 @@
         <result property="cutOffTime"    column="cut_off_time"    />
         <result property="superiorFinanceCenterCode"    column="superior_finance_center_code"    />
         <result property="siteType"    column="site_type"    />
+        <result property="scopeType"    column="scope_type"    />
         <result property="defaultDestinationNameCode"    column="default_destination_name_code"    />
         <result property="defaultSendPlace"    column="default_send_place"    />
         <result property="countryCode"    column="country_code"    />
@@ -117,6 +118,7 @@
         <result property="blNotRec"    column="bl_not_rec"    />
         <result property="blNotDisp"    column="bl_not_disp"    />
         <result property="blNotCashOut"    column="bl_not_cash_out"    />
+        <result property="status"    column="status"    />
         <result property="remark"    column="remark"    />
         <result property="tenantId"    column="tenant_id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -129,21 +131,22 @@
     </resultMap>
 
     <sql id="selectEmisSiteVo">
-        select id, site_code, site_name, site_name_en, parent_site_code, default_currency, cut_off_time, superior_finance_center_code, site_type, default_destination_name_code, default_send_place, country_code, province, city, county, town, area_code, area_name, range_name, phone, principal, manager, manager_phone, sale_phone, exigence_phone, fax, site_desc, dispatch_range, not_dispatch_range, public_remark, private_remark, order_num, financial_account, tb_ser_name, tb_ser_tel, tb_ser_ww, car_start_time, car_end_time, bl_web, join_time, maps_coordinate, specservice_range, qq, email, service_quality, sales_quality, levels, warehouse_name, site_limite, jy_mobile, jy_pwd, bl_not_input, stop_date, bl_allow_agent_money, bl_allow_topayment, goods_payment_limited, topayment_limited, bl_rec, bl_disp, bl_come, bl_open_taobao, bl_arbitration_department, bl_allow_agent_sign, bl_message, bl_provide, bl_projectclient, bl_vip_site, bl_dispatch_zt, bl_billto_account, account_code, address, disp_delivery_mode, trans_type_id, trans_type_name, org_id, org_name, data_from, site_area, bl_allow_disp_agent_money, disp_goods_payment_limited, disp_delivery_site, disp_delivery_site_code, vendor_name, credit_code, bl_cargo_service, bl_handling_service, pickup_center_site_code, bl_disp_good, bl_push_jd, push_date, reason, site_pos, distribute_code, bl_push_site, logo_type, size_code2, size_code3, audit_status, audit_date, audit_man_code, audit_site_code, bl_class, bl_material, soon_piece_type, province_area, second_area, second_area_code, province_area_code, bl_disp_good_name, bl_not_rec, bl_not_disp, bl_not_cash_out, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site
+        select id, site_code, site_name, site_name_en, parent_site_code, default_currency, cut_off_time, superior_finance_center_code, site_type, scope_type, default_destination_name_code, default_send_place, country_code, province, city, county, town, area_code, area_name, range_name, phone, principal, manager, manager_phone, sale_phone, exigence_phone, fax, site_desc, dispatch_range, not_dispatch_range, public_remark, private_remark, order_num, financial_account, tb_ser_name, tb_ser_tel, tb_ser_ww, car_start_time, car_end_time, bl_web, join_time, maps_coordinate, specservice_range, qq, email, service_quality, sales_quality, levels, warehouse_name, site_limite, jy_mobile, jy_pwd, bl_not_input, stop_date, bl_allow_agent_money, bl_allow_topayment, goods_payment_limited, topayment_limited, bl_rec, bl_disp, bl_come, bl_open_taobao, bl_arbitration_department, bl_allow_agent_sign, bl_message, bl_provide, bl_projectclient, bl_vip_site, bl_dispatch_zt, bl_billto_account, account_code, address, disp_delivery_mode, trans_type_id, trans_type_name, org_id, org_name, data_from, site_area, bl_allow_disp_agent_money, disp_goods_payment_limited, disp_delivery_site, disp_delivery_site_code, vendor_name, credit_code, bl_cargo_service, bl_handling_service, pickup_center_site_code, bl_disp_good, bl_push_jd, push_date, reason, site_pos, distribute_code, bl_push_site, logo_type, size_code2, size_code3, audit_status, audit_date, audit_man_code, audit_site_code, bl_class, bl_material, soon_piece_type, province_area, second_area, second_area_code, province_area_code, bl_disp_good_name, bl_not_rec, bl_not_disp, bl_not_cash_out, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site
     </sql>
 
     <select id="selectEmisSiteList" parameterType="EmisSite" resultMap="EmisSiteResult">
         <include refid="selectEmisSiteVo"/>
         <where>
             <if test="id != null "> and id = #{id}</if>
-            <if test="siteCode != null  and siteCode != ''"> and site_code=#{siteCode}</if>
+            <if test="siteCode != null  and siteCode != ''"> and site_code = #{siteCode}</if>
             <if test="siteName != null  and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
             <if test="siteNameEn != null  and siteNameEn != ''"> and site_name_en like concat('%', #{siteNameEn}, '%')</if>
-            <if test="parentSiteCode != null  and parentSiteCode != ''"> and parent_site_code like concat('%', #{parentSiteCode}, '%')</if>
+            <if test="parentSiteCode != null  and parentSiteCode != ''"> and parent_site_code = #{parentSiteCode}</if>
             <if test="defaultCurrency != null  and defaultCurrency != ''"> and default_currency like concat('%', #{defaultCurrency}, '%')</if>
             <if test="cutOffTime != null  and cutOffTime != ''"> and cut_off_time like concat('%', #{cutOffTime}, '%')</if>
             <if test="superiorFinanceCenterCode != null  and superiorFinanceCenterCode != ''"> and superior_finance_center_code like concat('%', #{superiorFinanceCenterCode}, '%')</if>
             <if test="siteType != null  and siteType != ''"> and site_type like concat('%', #{siteType}, '%')</if>
+            <if test="scopeType != null  and scopeType != ''"> and scope_type like concat('%', #{scopeType}, '%')</if>
             <if test="defaultDestinationNameCode != null  and defaultDestinationNameCode != ''"> and default_destination_name_code like concat('%', #{defaultDestinationNameCode}, '%')</if>
             <if test="defaultSendPlace != null  and defaultSendPlace != ''"> and default_send_place like concat('%', #{defaultSendPlace}, '%')</if>
             <if test="countryCode != null  and countryCode != ''"> and country_code like concat('%', #{countryCode}, '%')</if>
@@ -247,6 +250,7 @@
             <if test="blNotRec != null  and blNotRec != ''"> and bl_not_rec like concat('%', #{blNotRec}, '%')</if>
             <if test="blNotDisp != null  and blNotDisp != ''"> and bl_not_disp like concat('%', #{blNotDisp}, '%')</if>
             <if test="blNotCashOut != null  and blNotCashOut != ''"> and bl_not_cash_out like concat('%', #{blNotCashOut}, '%')</if>
+            <if test="status != null  and status != ''"> and status like concat('%', #{status}, '%')</if>
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@@ -261,7 +265,7 @@
     </select>
 
     <select id="selectEmisSiteById" parameterType="Long" resultMap="EmisSiteResult">
-        select id, site_code, site_name, site_name_en, parent_site_code, default_currency, cut_off_time, superior_finance_center_code, site_type, default_destination_name_code, default_send_place, country_code, province, city, county, town, area_code, area_name, range_name, phone, principal, manager, manager_phone, sale_phone, exigence_phone, fax, site_desc, dispatch_range, not_dispatch_range, public_remark, private_remark, order_num, financial_account, tb_ser_name, tb_ser_tel, tb_ser_ww, car_start_time, car_end_time, bl_web, join_time, maps_coordinate, specservice_range, qq, email, service_quality, sales_quality, levels, warehouse_name, site_limite, jy_mobile, jy_pwd, bl_not_input, stop_date, bl_allow_agent_money, bl_allow_topayment, goods_payment_limited, topayment_limited, bl_rec, bl_disp, bl_come, bl_open_taobao, bl_arbitration_department, bl_allow_agent_sign, bl_message, bl_provide, bl_projectclient, bl_vip_site, bl_dispatch_zt, bl_billto_account, account_code, address, disp_delivery_mode, trans_type_id, trans_type_name, org_id, org_name, data_from, site_area, bl_allow_disp_agent_money, disp_goods_payment_limited, disp_delivery_site, disp_delivery_site_code, vendor_name, credit_code, bl_cargo_service, bl_handling_service, pickup_center_site_code, bl_disp_good, bl_push_jd, push_date, reason, site_pos, distribute_code, bl_push_site, logo_type, size_code2, size_code3, audit_status, audit_date, audit_man_code, audit_site_code, bl_class, bl_material, soon_piece_type, province_area, second_area, second_area_code, province_area_code, bl_disp_good_name, bl_not_rec, bl_not_disp, bl_not_cash_out, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, site_code, site_name, site_name_en, parent_site_code, default_currency, cut_off_time, superior_finance_center_code, site_type, scope_type, default_destination_name_code, default_send_place, country_code, province, city, county, town, area_code, area_name, range_name, phone, principal, manager, manager_phone, sale_phone, exigence_phone, fax, site_desc, dispatch_range, not_dispatch_range, public_remark, private_remark, order_num, financial_account, tb_ser_name, tb_ser_tel, tb_ser_ww, car_start_time, car_end_time, bl_web, join_time, maps_coordinate, specservice_range, qq, email, service_quality, sales_quality, levels, warehouse_name, site_limite, jy_mobile, jy_pwd, bl_not_input, stop_date, bl_allow_agent_money, bl_allow_topayment, goods_payment_limited, topayment_limited, bl_rec, bl_disp, bl_come, bl_open_taobao, bl_arbitration_department, bl_allow_agent_sign, bl_message, bl_provide, bl_projectclient, bl_vip_site, bl_dispatch_zt, bl_billto_account, account_code, address, disp_delivery_mode, trans_type_id, trans_type_name, org_id, org_name, data_from, site_area, bl_allow_disp_agent_money, disp_goods_payment_limited, disp_delivery_site, disp_delivery_site_code, vendor_name, credit_code, bl_cargo_service, bl_handling_service, pickup_center_site_code, bl_disp_good, bl_push_jd, push_date, reason, site_pos, distribute_code, bl_push_site, logo_type, size_code2, size_code3, audit_status, audit_date, audit_man_code, audit_site_code, bl_class, bl_material, soon_piece_type, province_area, second_area, second_area_code, province_area_code, bl_disp_good_name, bl_not_rec, bl_not_disp, bl_not_cash_out, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_site a
         where a.id = #{id}
     </select>
@@ -278,6 +282,7 @@
             <if test="cutOffTime != null and cutOffTime != ''">cut_off_time,</if>
             <if test="superiorFinanceCenterCode != null and superiorFinanceCenterCode != ''">superior_finance_center_code,</if>
             <if test="siteType != null and siteType != ''">site_type,</if>
+            <if test="scopeType != null and scopeType != ''">scope_type,</if>
             <if test="defaultDestinationNameCode != null and defaultDestinationNameCode != ''">default_destination_name_code,</if>
             <if test="defaultSendPlace != null and defaultSendPlace != ''">default_send_place,</if>
             <if test="countryCode != null and countryCode != ''">country_code,</if>
@@ -381,6 +386,7 @@
             <if test="blNotRec != null and blNotRec != ''">bl_not_rec,</if>
             <if test="blNotDisp != null and blNotDisp != ''">bl_not_disp,</if>
             <if test="blNotCashOut != null and blNotCashOut != ''">bl_not_cash_out,</if>
+            <if test="status != null and status != ''">status,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -401,6 +407,7 @@
             <if test="cutOffTime != null and cutOffTime != ''">#{cutOffTime},</if>
             <if test="superiorFinanceCenterCode != null and superiorFinanceCenterCode != ''">#{superiorFinanceCenterCode},</if>
             <if test="siteType != null and siteType != ''">#{siteType},</if>
+            <if test="scopeType != null and scopeType != ''">#{scopeType},</if>
             <if test="defaultDestinationNameCode != null and defaultDestinationNameCode != ''">#{defaultDestinationNameCode},</if>
             <if test="defaultSendPlace != null and defaultSendPlace != ''">#{defaultSendPlace},</if>
             <if test="countryCode != null and countryCode != ''">#{countryCode},</if>
@@ -504,6 +511,7 @@
             <if test="blNotRec != null and blNotRec != ''">#{blNotRec},</if>
             <if test="blNotDisp != null and blNotDisp != ''">#{blNotDisp},</if>
             <if test="blNotCashOut != null and blNotCashOut != ''">#{blNotCashOut},</if>
+            <if test="status != null and status != ''">#{status},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -527,6 +535,7 @@
             <if test="cutOffTime != null and cutOffTime != ''">cut_off_time = #{cutOffTime},</if>
             <if test="superiorFinanceCenterCode != null and superiorFinanceCenterCode != ''">superior_finance_center_code = #{superiorFinanceCenterCode},</if>
             <if test="siteType != null and siteType != ''">site_type = #{siteType},</if>
+            <if test="scopeType != null and scopeType != ''">scope_type = #{scopeType},</if>
             <if test="defaultDestinationNameCode != null and defaultDestinationNameCode != ''">default_destination_name_code = #{defaultDestinationNameCode},</if>
             <if test="defaultSendPlace != null and defaultSendPlace != ''">default_send_place = #{defaultSendPlace},</if>
             <if test="countryCode != null and countryCode != ''">country_code = #{countryCode},</if>
@@ -630,6 +639,7 @@
             <if test="blNotRec != null and blNotRec != ''">bl_not_rec = #{blNotRec},</if>
             <if test="blNotDisp != null and blNotDisp != ''">bl_not_disp = #{blNotDisp},</if>
             <if test="blNotCashOut != null and blNotCashOut != ''">bl_not_cash_out = #{blNotCashOut},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>