add

src/main/java/com/zfire/jiasm/syncdata/dao/mapper/AZGDLcLsDownloadMapper.java

@@ -1,5 +1,6 @@
 package com.zfire.jiasm.syncdata.dao.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zfire.jiasm.syncdata.parameter.OrderPar;
 import com.zfire.jiasm.syncdata.plus.entity.ItfTblAzAssignLcLsDownload;
@@ -12,5 +13,6 @@ import org.apache.ibatis.annotations.Param;
  * @since 2023-02-17
  */
 public interface AZGDLcLsDownloadMapper extends BaseMapper<ItfTblAzAssignLcLsDownload> {
+    @SqlParser(filter = true)
     OrderBase getOrderBase(@Param("request") OrderPar request);
 }

src/main/java/com/zfire/jiasm/syncdata/download/basedata/GLPPGFWebsitWorker.java

@@ -47,7 +47,7 @@ public class GLPPGFWebsitWorker {
      * X2300000 佛山销售网点维修工基础资料下载
      * @return
      */
-    @Scheduled(fixedDelay = 1 * 60 * 1000)
+    @Scheduled(fixedDelay = 1 * 10 * 1000)
     @Transactional(rollbackFor = Exception.class)
     public void processFSXSWDTask() throws Exception {
         if (1==1){
@@ -92,7 +92,7 @@ public class GLPPGFWebsitWorker {
      * X2100000 广州销售网点维修工基础资料下载
      * @return
      */
-    @Scheduled(fixedDelay = 1 * 60 * 1000)
+    @Scheduled(fixedDelay = 1 * 10 * 1000)
     @Transactional(rollbackFor = Exception.class)
     public void processGZXSWDTask() throws Exception {
         if (1==1){
@@ -137,7 +137,7 @@ public class GLPPGFWebsitWorker {
      * S9219807 佛山售后网点维修工基础资料下载
      * @return
      */
-    @Scheduled(fixedDelay = 1 * 60 * 1000)
+    @Scheduled(fixedDelay = 1 * 10 * 1000)
     @Transactional(rollbackFor = Exception.class)
     public void processFSSHWDTask() throws Exception {
         if (1==1){
@@ -182,12 +182,12 @@ public class GLPPGFWebsitWorker {
      * S9219801 广州售后网点维修工基础资料下载
      * @return
      */
-    @Scheduled(fixedDelay = 1 * 60 * 1000)
+    @Scheduled(fixedDelay = 1 * 10 * 1000)
     @Transactional(rollbackFor = Exception.class)
     public void processGZSHWDTask() throws Exception {
-        if (1==1){
+        /*if (1==1){
             return;
-        }
+        }*/
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map<String, String> paramMap = new HashMap<String, String>();

src/main/java/com/zfire/jiasm/syncdata/download/worker/GLPPWXGQueryUpdate.java

@@ -127,12 +127,13 @@ public class GLPPWXGQueryUpdate {
                 //.eq(ItfTblWangdianWxgDownload::getWxgno,"S21A00200023")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
-        //本地提取商户师傅网点信息
+        //本地提取商户师傅网点信息 一个师傅可多网点 格力最多3个网点
         wbarecs = workerBrandAccountService.lambdaQuery()
                 .eq(WorkerBrandAccount::getBrandId, brand.getBrandId()).list();
 
         log.info("开始同步网点师傅信息: \uF0B7{}",sdf.format(new Date()));
 
+        // 遍历格力总部的所有师傅信息
         for (ItfTblWangdianWxgDownload wxg :wxgRecs){
             // 本地提取商户师傅信息 按品牌，网点，师傅编号 不存在不处理
             WorkerBrandAccount workerBrandAccount = getWorkerBrandAccount(wbarecs, wxg);
@@ -188,9 +189,10 @@ public class GLPPWXGQueryUpdate {
     private WorkerBrandAccount getWorkerBrandAccount(List<WorkerBrandAccount> wbarecs, ItfTblWangdianWxgDownload wxg) {
         WorkerBrandAccount workerBrandAccount = null;
 
+        // 平台师傅信息未同步到格力总部时不处理
         for (WorkerBrandAccount wba: wbarecs){
-            if (StringUtils.isEmpty(wba.getBrandWebsitNumber()) && StringUtils.isEmpty(wba.getBrandWorkerNumber()) &&
-                    StringUtils.isEmpty(wxg.getWdno()) && StringUtils.isEmpty(wxg.getWxgno())){
+            if (StringUtils.isEmpty(wba.getBrandWebsitNumber()) || StringUtils.isEmpty(wba.getBrandWorkerNumber()) ||
+                    StringUtils.isEmpty(wxg.getWdno()) || StringUtils.isEmpty(wxg.getWxgno())){
                 continue;
             }
             if (wba.getBrandWebsitNumber().equals(wxg.getWdno())

src/main/java/com/zfire/jiasm/syncdata/upload/worker/UploadWorkerTOGree.java

@@ -122,7 +122,7 @@ public class UploadWorkerTOGree {
                 WorkUploadInfo req = new WorkUploadInfo();
                 WorkerCertificateInfo workerCertificateInfo = new WorkerCertificateInfo();
 
-                // 获取师傅信息
+                // 获取师傅信息  需要同步的师傅必须在平台系统中存在
                 if (!workersMap.containsKey(item.getWorkerId())){
                     continue;
                 }
@@ -139,7 +139,7 @@ public class UploadWorkerTOGree {
                     continue;
                 }
 
-                // 查看师傅服务区域
+                // 查看师傅服务区域 规定随便取一个地址即可
                 workerStreet = getWorkerStreet(item, worker);
                 if (workerStreet == null) {
                     continue;
@@ -199,14 +199,14 @@ public class UploadWorkerTOGree {
                     if (StringUtils.isNotEmpty(dot.getBrandWorkerNumber())){
                         req.setWxgno(dot.getBrandWorkerNumber());
                         // 重值部分数据 以格力门店数据为准
-                        resetParameter(wdwxgMap, req);
+                        resetParameter(wdwxgMap, req,workerStreet);
                     } else {
                         // 省份-城市-区县-乡镇
                         /*if (extractedPCAS(req, workerStreet,brand.getBrandId(),item)){
                             continue;
                         }*/
 
-                        extractedPCAS(req, workerStreet,brand.getBrandId(),item);
+                        extractedPCAS(req, workerStreet);
                     }
                     // 所属网点
                     req.setWdno(dot.getBrandWebsitNumber());
@@ -236,7 +236,7 @@ public class UploadWorkerTOGree {
         return;
     }
 
-    private void resetParameter(Map<String, List<ItfTblWangdianPositionDownload>> wdwxgMap, WorkUploadInfo req) {
+    private void resetParameter(Map<String, List<ItfTblWangdianPositionDownload>> wdwxgMap, WorkUploadInfo req,WorkerStreet workerStreet) {
         if (wdwxgMap.containsKey(req.getWxgno())){
             ItfTblWangdianPositionDownload i = wdwxgMap.get(req.getWxgno()).get(0);
             req.setSfen(i.getSfen());
@@ -256,6 +256,8 @@ public class UploadWorkerTOGree {
             req.setVipflag(i.getVipflag());
             req.setMaxaznum(i.getMaxaznum());
             req.setMaxwxnum(i.getMaxwxnum());
+        } else {
+            extractedPCAS(req, workerStreet);
         }
     }
 
@@ -279,16 +281,18 @@ public class UploadWorkerTOGree {
             for (SignSplb sy : sySignSplbList){
                 for (SignSplb wdsy: websitqypl.getSySignSplbList()){
                     if (wdsy.getSpdl().equals(sy.getSpdl())){
-                        if (wdsy.getSpxl()==null){
+                        /*if (wdsy.getSpxl()==null){
                             result="网点:【"+brandWebsitNumber+"】商用大类【"+wdsy.getSpdl()+"】下未签约小类";
                             return result;
-                        }
+                        }*/
                         SignSplb one = new SignSplb();
                         one.setFwlbList(syfwlbList);
                         one.setSpdl(wdsy.getSpdl());
                         one.setSpdlName(wdsy.getSpdlName());
-                        one.setSpxl(wdsy.getSpxl());
-                        one.setSpxlName(wdsy.getSpxlName());
+                        if (wdsy.getSpxl()!=null){
+                            one.setSpxl(wdsy.getSpxl());
+                            one.setSpxlName(wdsy.getSpxlName());
+                        }
                         syList.add(one);
                     }
                 }
@@ -304,16 +308,18 @@ public class UploadWorkerTOGree {
             for (SignSplb sy : jySignSplbList){
                 for (SignSplb wdjy: websitqypl.getJySignSplbList()){
                     if (wdjy.getSpdl().equals(sy.getSpdl()) ){
-                        if (wdjy.getSpxl()==null){
+                        /*if (wdjy.getSpxl()==null){
                             result="网点:【"+brandWebsitNumber+"】家用大类【"+wdjy.getSpdl()+"】下未签约小类";
                             return result;
-                        }
+                        }*/
                         SignSplb one = new SignSplb();
-                        one.setFwlbList(syfwlbList);
+                        one.setFwlbList(jyfwlbList);
                         one.setSpdl(wdjy.getSpdl());
                         one.setSpdlName(wdjy.getSpdlName());
-                        one.setSpxl(wdjy.getSpxl());
-                        one.setSpxlName(wdjy.getSpxlName());
+                        if (wdjy.getSpxl()==null){
+                            one.setSpxl(wdjy.getSpxl());
+                            one.setSpxlName(wdjy.getSpxlName());
+                        }
                         jyList.add(one);
                     }
                 }
@@ -658,7 +664,7 @@ public class UploadWorkerTOGree {
         setReq(zjInfoList, req, worker);
     }
 
-    private Boolean extractedPCAS(WorkUploadInfo req, WorkerStreet workerStreet, String brandId, OutWorkerUpload item) {
+    private Boolean extractedPCAS(WorkUploadInfo req, WorkerStreet workerStreet) {
 
         req.setSfen(workerStreet.getProvince());
         req.setCshi(workerStreet.getCity());

src/main/resources/mapper/AZGDLcLsDownloadMapper.xml

@@ -19,7 +19,10 @@
                a.yhqwkssj as expect_start_time,a.yhqwjssj as expect_end_time,a.gpsdzxx as gps_address,
                a.cjwdno as create_sys,a.zjczwd as last_operator_websit,a.zjczwdxtbh as sys_websit_number,
                a.zjczren as last_operator_by,a.zjczsj as last_operator_time,a.xslx as sale_type,a.lcid as process_no,
-               a.djlxno as  bill_type_no,a.yyazsj as appointment_time,a.sfwcps as is_delivery_over,a.azsl as total_num,
+               a.djlxno as  bill_type_no,a.yyazsj as appointment_time,
+               case a.sfwcps when '0' then 'NO'
+                             when '1' then 'YES' else 'NO' end as is_delivery_over,
+               a.azsl as total_num,
                a.wwsl as undone_num,a.xsdh as sale_no,n.websit_id as sale_websit_id,n.websit_name as sale_websit_name,
                o.websit_id as sale_websit_sys_number,a.fphm as invoice_no,a.gmsj as buy_time,a.kqbh as cross_no,
                a.xsorsh as data_push_attr,a.jindu as lng,a.weidu as lat,a.shsj as delivery_time,a.sfygllc as sfygllc,

src/main/resources/mapper/DetailOrderInstallMapper.xml

@@ -16,7 +16,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               h.wxgmc as azren,h.wxgid as azrenid,
+               a.worker_name as azren,h.brand_worker_id as azrenid,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -33,12 +33,7 @@
                            (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
                                    (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
-                 left join itf_tbl_wangdian_wxg_download h on h.sfzen in
-                           (select idcard from worker where worker_id in
-                                   (select worker_id from order_install_detail where id = #{request.id}))
-                       and h.wdno in (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId}
-                                                                                          and websit_id in
-                                     (select operator_websit_id from order_install_detail where id = #{request.id}))
+                 left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
     </select>
 
@@ -56,7 +51,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               h.wxgmc as azren,h.wxgid as azrenid,
+               a.worker_name as azren,h.brand_worker_id as azrenid,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -73,12 +68,7 @@
                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
-                 left join itf_tbl_wangdian_wxg_download h on h.sfzen in
-                           (select idcard from worker where worker_id in
-                                   (select worker_id from order_install_detail where id = #{request.id}))
-                     and h.wdno in (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId}
-                                                                                        and websit_id in
-                                           (select operator_websit_id from order_install_detail where id = #{request.id}))
+                 left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
     </select>
 
@@ -97,7 +87,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               h.wxgmc as azren,h.wxgid as azrenid,
+               a.worker_name as azren,h.brand_worker_id as azrenid,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -114,12 +104,7 @@
                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
-                 left join itf_tbl_wangdian_wxg_download h on h.sfzen in
-                          (select idcard from worker where worker_id in
-                                  (select worker_id from order_install_detail where id = #{request.id}))
-                           and h.wdno in (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId}
-                                                                                              and websit_id in
-                                                  (select operator_websit_id from order_install_detail where id = #{request.id}))
+                 left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
     </select>
 
@@ -137,7 +122,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               h.wxgmc as azren,h.wxgid as azrenid,
+               a.worker_name as azren,h.brand_worker_id as azrenid,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -151,15 +136,10 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                                                                                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                            (select operator_websit_id from order_install_detail where id = #{request.id}))
+                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
-                 left join itf_tbl_wangdian_wxg_download h on h.sfzen in
-                                                              (select idcard from worker where worker_id in
-                                                                                               (select worker_id from order_install_detail where id = #{request.id}))
-            and h.wdno in (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId}
-                                                                               and websit_id in
-                                                                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
+                 left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
     </select>
 
@@ -177,7 +157,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               h.wxgmc as azren,h.wxgid as azrenid,
+               a.worker_name as azren,h.brand_worker_id as azrenid,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -191,15 +171,10 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                                                                                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                            (select operator_websit_id from order_install_detail where id = #{request.id}))
+                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
-                 left join itf_tbl_wangdian_wxg_download h on h.sfzen in
-                                                              (select idcard from worker where worker_id in
-                                                                                               (select worker_id from order_install_detail where id = #{request.id}))
-            and h.wdno in (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId}
-                                                                               and websit_id in
-                                                                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
+                 left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
     </select>
 
@@ -217,7 +192,7 @@
                if(a.first_time is null,a.update_time,a.first_time) as dqjdsj,
                if(a.first_time is null,a.update_time,a.first_time) as zjczsj,
                if(a.first_time is null,a.update_time,a.first_time) as cjdt,
-               h.wxgmc as azren,h.wxgid as azrenid,
+               a.worker_name as azren,h.brand_worker_id as azrenid,
                case a.source when 'MOBILE' then 2 else 1 end as dnorsj,a.settle_websit_id as jsdwxtbh,
                if(a.first_time is null,a.update_time,a.first_time) as scazsj,
                a.settle_amount as azfy,a.settle_amount as jsfy,
@@ -231,15 +206,10 @@
                  left join sys_dict_ref d on d.dict_code=a.small_id and d.brand_id = #{request.brandId} and d.dict_type='SMALL_TYPE'
                  left join sys_dict_ref e on e.dict_code=a.series_id and e.brand_id = #{request.brandId} and e.dict_type='SERIES'
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                                                                                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                            (select operator_websit_id from order_install_detail where id = #{request.id}))
+                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
                  left join order_install_detail_fee g on g.order_base_id = a.order_base_id and g.order_detail_id=a.id
-                 left join itf_tbl_wangdian_wxg_download h on h.sfzen in
-                                                              (select idcard from worker where worker_id in
-                                                                                               (select worker_id from order_install_detail where id = #{request.id}))
-            and h.wdno in (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId}
-                                                                               and websit_id in
-                                                                                   (select operator_websit_id from order_install_detail where id = #{request.id}))
+                 left join worker_brand_account h on h.worker_id = a.worker_id and h.websit_id = a.operator_websit_id and h.del=0
         where a.order_base_id = #{request.orderNo} and a.status in( '1' , '2') and a.id = #{request.id}
     </select>
 

src/main/resources/mapper/GDOrderBaseMapper.xml

@@ -10,7 +10,7 @@
                     when b.belong_company = 'S9219801' then '020'
                   else a.area_code end as quhao,
                a.tel_phone as dhhm,a.address as dizi,a.info_channel as xxqd,a.info_source as xxly,a.remark as beiz,a.user_attr as yhsx,
-               c.ref_dict_code as spid,c.ref_dict_name as spmc,d.wxgid as azrenid,d.wxgmc as azren,e.brand_websit_number as azwdno,
+               c.ref_dict_code as spid,c.ref_dict_name as spmc,d.brand_worker_id as azrenid,a.worker_name as azren,e.brand_websit_number as azwdno,
                e.brand_websit_name as azwdmc,e.sys_websit_number as azwdxtbh,f.brand_websit_number as jspgwdno,
                f.brand_websit_name as jspgwdmc,f.sys_websit_number as jspgwdxtbh,a.rece_time as jspgwdsj,
                case  when g.belong_company in('X2300000', 'S9219807') then '佛山'
@@ -20,7 +20,10 @@
                a.expect_start_time as yhqwkssj,a.expect_end_time as yhqwjssj,m.brand_order_state as stat,a.gps_address as gpsdzxx,
                a.create_by as cjren,a.create_name as cjrmc,a.create_time as cjdt,h.brand_websit_number as cjwdno,h.sys_websit_number as cjwdxtbh,
                i.brand_websit_number as zjczwd,i.sys_websit_number as zjczwdxtbh,a.last_operator_time as zjczsj,a.sale_type as xslx,
-               a.appointment_time as yyazsj,a.is_delivery_over as sfwcps,a.sale_no as xsdh,j.engin_no as gcbh,j.engin_name as gcmc,
+               a.appointment_time as yyazsj,
+               case a.is_delivery_over when 'NO' then '0'
+                                       when 'YES' then '1' else '0' end as sfwcps,
+               a.sale_no as xsdh,j.engin_no as gcbh,j.engin_name as gcmc,
                a.total_num as azsl,a.undone_num as wwsl,a.link_name as lxren,k.brand_websit_number as xsdwno,
                k.brand_websit_name as xswdmc,k.sys_websit_number as xsdwxtbh,a.invoice_no as fphm,a.buy_time as gmsj,
                a.cross_no as kqbh,a.data_push_attr as xsorsh,a.order_status_time as dqjdsj,l.brand_order_state as syjd,
@@ -37,11 +40,7 @@
         from order_base a
             left join brand_websit b on b.brand_websit_number=a.rece_websit_id and b.brand_id = #{request.brandId}
             left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
-            left join itf_tbl_wangdian_wxg_download d on d.sfzen in
-                 (select idcard from worker where worker_id in
-                                (select worker_id from order_base where id = #{request.orderNo})) and d.wdno in
-                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                (select rece_websit_id from order_base where id = #{request.orderNo}))
+            left join worker_brand_account d on d.worker_id = a.worker_id and d.websit_id = a.rece_websit_id and d.del=0
             left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
                  (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
                                  (select websit_id from order_base where id = #{request.orderNo}))
@@ -74,7 +73,7 @@
                a.info_channel as xxqd,a.info_source as xxly,a.info_type as xxlb,a.remark as beiz,a.file_no as gdhao,
                m.brand_order_state as stat,a.expect_start_time as yhqwsmsj,c.ref_dict_code as spid,c.ref_dict_name as spmc,
                i.brand_websit_number as zjczwd,a.create_by as cjren,a.create_name as cjrmc,a.create_time as cjdt,
-               h.brand_websit_number as cjwdno,a.worker_name as wxren,d.wxgid as wxrenid,a.over_time as wcsj,
+               h.brand_websit_number as cjwdno,a.worker_name as wxren,d.brand_worker_id as wxrenid,a.over_time as wcsj,
                e.brand_websit_number as wxwdno,e.brand_websit_name as wxwdmc,'' as xjwdno,'' as xjwdmc,a.priority as yxji,
                case  when g.belong_company in('X2300000', 'S9219807') then '佛山'
                      when g.belong_company in('X2100000', 'S9219801') then '广州'
@@ -92,11 +91,7 @@
                '1' as extjson5,a.vip as extendfiled2
         from order_base a
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = 1 and c.dict_type='MAIN_TYPE'
-                 left join itf_tbl_wangdian_wxg_download d on d.sfzen in
-                           (select idcard from worker where worker_id in
-                                   (select worker_id from order_base where id = #{request.orderNo})) and d.wdno in
-                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                   (select rece_websit_id from order_base where id = #{request.orderNo}))
+                 left join worker_brand_account d on d.worker_id = a.worker_id and d.websit_id = a.rece_websit_id and d.del=0
                  left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
                            (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
                                    (select websit_id from order_base where id = #{request.orderNo}))
@@ -156,7 +151,7 @@
                     when b.belong_company = 'S9219801' then '020'
                     else a.area_code end as quhao,
                a.tel_phone as dhhm,a.address as dizi,a.info_channel as xxqd,a.info_source as xxly,a.remark as beiz,a.user_attr as yhsx,
-               c.ref_dict_code as spid,c.ref_dict_name as spmc,d.wxgid as azrenid,d.wxgmc as azren,e.brand_websit_number as azwdno,
+               c.ref_dict_code as spid,c.ref_dict_name as spmc,d.brand_worker_id as azrenid,a.worker_name as azren,e.brand_websit_number as azwdno,
                e.brand_websit_name as azwdmc,e.sys_websit_number as azwdxtbh,f.brand_websit_number as jspgwdno,
                f.brand_websit_name as jspgwdmc,f.sys_websit_number as jspgwdxtbh,a.rece_time as jspgwdsj,
                case  when g.belong_company in('X2300000', 'S9219807') then '佛山'
@@ -166,7 +161,10 @@
                a.expect_start_time as yhqwkssj,a.expect_end_time as yhqwjssj,m.brand_order_state as stat,a.gps_address as gpsdzxx,
                a.create_by as cjren,a.create_name as cjrmc,a.create_time as cjdt,h.brand_websit_number as cjwdno,h.sys_websit_number as cjwdxtbh,
                i.brand_websit_number as zjczwd,i.sys_websit_number as zjczwdxtbh,a.last_operator_time as zjczsj,a.sale_type as xslx,
-               a.appointment_time as yyazsj,a.is_delivery_over as sfwcps,a.sale_no as xsdh,j.engin_no as gcbh,j.engin_name as gcmc,
+               a.appointment_time as yyazsj,
+               case a.is_delivery_over when 'NO' then '0'
+                                       when 'YES' then '1' else '0' end as sfwcps,
+               a.sale_no as xsdh,j.engin_no as gcbh,j.engin_name as gcmc,
                a.total_num as azsl,a.undone_num as wwsl,a.link_name as lxren,k.brand_websit_number as xsdwno,
                k.brand_websit_name as xswdmc,k.sys_websit_number as xsdwxtbh,a.invoice_no as fphm,a.buy_time as gmsj,
                a.cross_no as kqbh,a.data_push_attr as xsorsh,a.order_status_time as dqjdsj,l.brand_order_state as syjd,
@@ -183,30 +181,26 @@
         from order_base a
                  left join brand_websit b on b.brand_websit_number=a.rece_websit_id and b.brand_id = #{request.brandId}
                  left join sys_dict_ref c on c.dict_code=a.main_id and c.brand_id = #{request.brandId} and c.dict_type='MAIN_TYPE'
-                 left join itf_tbl_wangdian_wxg_download d on d.sfzen in
-                                                              (select idcard from worker where worker_id in
-                                                                                               (select worker_id from order_base where id = #{request.orderNo})) and d.wdno in
-                                                                                                                                                                     (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                                                                                                                (select rece_websit_id from order_base where id = #{request.orderNo}))
+                 left join worker_brand_account d on d.worker_id = a.worker_id and d.websit_id = a.rece_websit_id and d.del=0
                  left join brand_websit e on e.brand_id = #{request.brandId} and e.brand_websit_number in
-                                                                                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                            (select websit_id from order_base where id = #{request.orderNo}))
+                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                                   (select websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit f on f.brand_id = #{request.brandId} and f.brand_websit_number in
-                                                                                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                            (select rece_websit_id from order_base where id = #{request.orderNo}))
+                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                                   (select rece_websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit g on g.brand_id = #{request.brandId} and g.brand_websit_number in
-                                                                                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                            (select rece_websit_id from order_base where id = #{request.orderNo}))
+                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                                   (select rece_websit_id from order_base where id = #{request.orderNo}))
                  left join brand_websit h on h.brand_id = #{request.brandId} and h.brand_websit_number in
-                                                                                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                            (select create_sys from order_base where id = #{request.orderNo}))
+                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                                   (select create_sys from order_base where id = #{request.orderNo}))
                  left join brand_websit i on i.brand_id = #{request.brandId} and i.brand_websit_number in
-                                                                                 (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                            (select last_operator_websit from order_base where id = #{request.orderNo}))
+                           (select brand_websit_number from websit_order_sign where brand_id = #{request.brandId} and websit_id in
+                                   (select last_operator_websit from order_base where id = #{request.orderNo}))
                  left join order_install j on j.order_base_id=a.id and a.id = #{request.orderNo}
                  left join brand_websit k on k.brand_id = #{request.brandId} and k.brand_websit_number in
-                                                                                 (select ref_websit_id from customer_information_websit where brand_id = #{request.brandId} and websit_id in
-                                                                                                                                                                                (select sale_websit_id from order_base where id = #{request.orderNo}))
+                           (select ref_websit_id from customer_information_websit where brand_id = #{request.brandId} and websit_id in
+                                   (select sale_websit_id from order_base where id = #{request.orderNo}))
                  left join order_state_contrast l on l.order_state=a.last_order_status and l.state_type=10 and l.brand_id = #{request.brandId}
                  left join order_state_contrast m on m.order_state=a.order_status and m.state_type=10 and m.brand_id = #{request.brandId}
         where a.id = #{request.orderNo}