yaozhixue 1 jaar geleden
bovenliggende
commit
e1426368ab

+ 2 - 0
src/main/java/com/zfire/jiasm/syncdata/api/OrderAddBeanDTO.java

@@ -223,4 +223,6 @@ public class OrderAddBeanDTO {
     private String createWebsitId;
     // 创建网点名称
     private String createWebsitName;
+    // gree总部虚拟号码
+    private String greeVirtualnumber;
 }

+ 2 - 2
src/main/resources/mapper/AZGDLcLsDownloadMapper.xml

@@ -5,7 +5,7 @@
         select pgid,pgguid,'INSTALL' as order_type,'INSTALL' as order_small_type,c.order_state as order_status,
                a.dqjdsj as order_status_time,d.order_state as last_order_status,e.order_state as dispatch_status,
                a.pgsj as dispatch_time,a.yhmc as user_name,a.lxren as link_name,a.yddh as user_mobile,a.yddh2 as user_mobile2,
-               a.yhsx as user_attr,IFNULL(a.quhao, '') as area_code,IFNULL(a.dhhm,'') as tel_phone,a.fjhm,a.extendfiled2 as vip,a.email,
+               a.yhsx as user_attr,IFNULL(a.quhao, '') as area_code,IFNULL(a.dhhm,'') as tel_phone,a.extendfiled2 as vip,a.email,
                IFNULL(a.sfen,'') as province,IFNULL(a.cshi,'') as city,IFNULL(a.xian,'') as area,IFNULL(a.xzhen,'') as street,
                a.sfenid as province_id,a.cshiid as city_id,a.xianid as area_id,a.xzhenid as street_id,
                IFNULL(a.dizi,'') as address,a.xxlb as info_type,
@@ -62,7 +62,7 @@
 
 
                a.dqjdsj as order_status_time,d.order_state as last_order_status,e.order_state as dispatch_status,
-               a.fjhm,a.extendfiled2 as vip,a.email,
+               a.fjhm as gree_virtualnumber,a.extendfiled2 as vip,a.email,
                IFNULL(a.yxji,'1') as priority,a.gdhao as file_no,f.dict_code as main_id,f.dict_value as main_name,
                g.dict_code as service_category_id,g.dict_value as service_category_name,
                IFNULL(a.azwdno, '') as websit_id,

+ 1 - 1
src/main/resources/mapper/GDOrderBaseMapper.xml

@@ -42,7 +42,7 @@
         select a.id as worker_order_no,a.pgid,'guangfo' as created_by,a.create_time as created_date,'guangfo' as last_modified_by,
           a.update_time as last_modified_date,IFNULL(a.user_name,'') as yhmc,IFNULL(a.user_mobile,'') as yddh,
           IFNULL(a.area_code,'') as quhao,IFNULL(a.tel_phone,'') as dhhm,
-          a.fjhm,IFNULL(a.email,''),a.province as sfen,a.province_id as sfenid,a.city as cshi,a.city_id as cshiid,a.area as xian,
+          a.gree_virtualnumber as fjhm,IFNULL(a.email,''),a.province as sfen,a.province_id as sfenid,a.city as cshi,a.city_id as cshiid,a.area as xian,
           a.area_id as xianid,a.street as xzhen,a.street_id as xzhenid,
           if(length(a.address)>100,left(a.address,100),a.address) as dizi,
           if(length(a.gps_address)>130,left(a.gps_address,130),a.gps_address) as gpsdzxx,

+ 6 - 3
src/main/resources/mapper/RepairDownloadMapper.xml

@@ -5,7 +5,8 @@
         select a.pgid,a.pgguid,'REPAIR' as order_type,c.order_state as order_status,d.order_state as last_order_status,
                a.dqjdsj as order_status_time,IFNULL(a.yxji,'1') as priority,a.xjwdsj as dispatch_time,
                a.xjwdsj as dispatch_websit_time,a.yhmc as user_name,a.yddh as user_mobile,
-               a.yddh2 as user_mobile2,a.yhsx as user_attr,a.quhao as area_code,a.dhhm as tel_phone,a.fjhm,a.email,a.vip,
+               a.yddh2 as user_mobile2,a.yhsx as user_attr,a.quhao as area_code,a.dhhm as tel_phone,
+               a.fjhm as gree_virtualnumber,a.email,a.vip,
                a.sfen as province,a.cshi as city,a.xian as area,a.xzhen as street,
                a.sfenid as province_id,a.cshiid as city_id,a.xianid as area_id,a.xzhenid as street_id,
                a.dizi as address,IFNULL(a.gpsdzxx,'') as gps_address,
@@ -55,8 +56,10 @@
                a.xxqdid as info_channel_id,ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,ifnull(a.xxly,'') as info_source,
                a.wcsj as over_time,IFNULL(a.zjczsj,a.last_modified_date) as last_operator_time,
                IFNULL(a.last_modified_date,a.zjczsj) as update_time,a.yhsx as user_attr,a.yhsxid as user_attr_id,
-               a.fjhm,a.gdhao as file_no,a.zxhao as seat_no,a.xjwdsj as rece_time,a.yhqwsmsj as appointment_time,
-               a.yhqwsmsj as expect_start_time,a.qwsmjssj as expect_end_time,a.fjhm,a.wxcount as out_wxcount
+               a.fjhm as gree_virtualnumber,
+               a.gdhao as file_no,a.zxhao as seat_no,a.xjwdsj as rece_time,a.yhqwsmsj as appointment_time,
+               a.yhqwsmsj as expect_start_time,a.qwsmjssj as expect_end_time,
+               a.wxcount as out_wxcount
         from itf_tbl_assign_download a
         where a.syn_req_id = #{request.synReqId}
     </select>