yaozhixue 2 years ago
parent
commit
f0928225db

+ 6 - 3
src/main/java/com/zfire/jiasm/syncdata/download/order/InstallBusinessApi.java

@@ -1,6 +1,5 @@
 package com.zfire.jiasm.syncdata.download.order;
 
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.zfire.jiasm.syncdata.base.BaseService;
 import com.zfire.jiasm.syncdata.constant.DictTypeEnum;
@@ -9,7 +8,6 @@ import com.zfire.jiasm.syncdata.constant.TaskConfigEnum;
 import com.zfire.jiasm.syncdata.plus.entity.*;
 import com.zfire.jiasm.syncdata.plus.service.ItfTblAzAssignLcLsDownloadService;
 import com.zfire.jiasm.syncdata.plus.service.OrderBaseService;
-import com.zfire.jiasm.syncdata.plus.service.ProductService;
 import com.zfire.jiasm.syncdata.plus.service.SysDictRefService;
 import com.zfire.jiasm.syncdata.service.AddInstallBusiness;
 import com.zfire.jiasm.syncdata.service.JiasmApi;
@@ -84,10 +82,15 @@ public class InstallBusinessApi {
         lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
                 .eq(ItfTblAzAssignLcLsDownload::getSynStatus, SynStatusEnum.UN_SYN.getCode())
                 .lt(ItfTblAzAssignLcLsDownload::getSynTimes, 2)
-                // .eq(ItfTblAzAssignLcLsDownload::getSynReqId,-1L)// 测试使用
                 .orderByAsc(ItfTblAzAssignLcLsDownload::getSynReqId)
                 .list();
 
+        // 测试使用
+        /*lcls = itfTblAzAssignLcLsDownloadService.lambdaQuery()
+                .eq(ItfTblAzAssignLcLsDownload::getSynReqId,173039L)
+                .list();*/
+
+
         if (lcls.size()<1){
             log.info("暂无待处理的安装工单: \uF0B7{}",sdf.format(new Date()));
             return;

+ 1 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -360,6 +360,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         wxgDownladRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
                 .eq(ItfTblWangdianWxgDownload::getCertStatus,0)
                 // .eq(ItfTblWangdianWxgDownload::getSfzen,"440785199006194614")// 测试用
+                // .eq(ItfTblWangdianWxgDownload::getWdno,"S2106139")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
 

+ 2 - 2
src/main/resources/bootstrap-prdt.properties

@@ -302,7 +302,7 @@ workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
 workerrzc=FALSE
-inbeforec=TRUE
+inbeforec=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE
@@ -374,7 +374,7 @@ ththhgxc=FALSE
 wxzjsc=FALSE
 wxzjscxc=FALSE
 #网点维修工 证件照,服务类目,位置、新增同步到本地、修改、保险、总部下载的采集图
-zjzxxc=FALSE
+zjzxxc=TRUE
 lmxxc=FALSE
 wxgwzc=FALSE
 wxgxgc=FALSE

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

@@ -33,7 +33,7 @@
         select a.out_id as fa_order_repair_part_info_id,b.wxjsmxguid as wxjsmxguid,
                'guangfo' as created_by,a.create_time as created_date,'guangfo' as last_modified_by,
                a.update_time as last_modified_date,b.brand_wxjsguid as wxjsguid,
-               a.old_part_no as jpjbh,a.old_part_name as jpjmc,0 as jpjsl,0 as jpjdj,0 as jpjje,a.new_part_no as xpjbh,
+               a.old_part_no as jpjbh,a.old_part_name as jpjmc,1 as jpjsl,0 as jpjdj,0 as jpjje,a.new_part_no as xpjbh,
                a.new_part_name as xpjmc,a.new_part_price as xpjdj,a.new_part_count as xpjsl,a.new_part_count*a.new_part_price as xpjje,
                a.new_part_no as pjtm,'' as jgrtm,'' as xgrtm,
                ifnull(a.repair_item_id,'') as jpjwxxmh,a.repair_item_name as jpjwxxmhmc