yaozhixue 1 yıl önce
ebeveyn
işleme
6f0a291e7b

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

@@ -508,7 +508,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         }
     }
 
-    private boolean getaddres(OutWorkerUpload item, WorkUploadInfo req, WorkerBrandAccount dot) {
+    private boolean getaddres(OutWorkerUpload item, WorkUploadInfo req, @NotNull WorkerBrandAccount dot) {
         WebsitWorker wwone = websitWorkerService.lambdaQuery()
                 .eq(WebsitWorker::getWebsitWorkerId, dot.getWebsitWorkerId()).one();
         if (StringUtils.isNotEmpty(wwone.getLng()) && StringUtils.isNotEmpty(wwone.getLat())){

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

@@ -299,7 +299,7 @@ workercertificatec=FALSE
 workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
-workerrzc=FALSE
+workerrzc=TRUE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
 recycledownc=FALSE
 recyclefkdownc=FALSE
@@ -329,7 +329,7 @@ fsxwxgc=FALSE
 fsswxgc=FALSE
 gzxwxgc=FALSE
 gzswxgc=FALSE
-gfwwwc=TRUE
+gfwwwc=FALSE
 #类别大类、小类、系列、机型
 lbdlc=FALSE
 lbxlc=FALSE

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

@@ -4,7 +4,7 @@
 
     <select id="getItfTblWxjsWxxmJyktUpload" parameterType="com.zfire.jiasm.syncdata.parameter.OrderPar" resultType="com.zfire.jiasm.syncdata.plus.entity.ItfTblWxjsWxxmJyktUpload">
         select a.out_id as fa_order_repair_data_info_id,
-               a.out_id as wxxmguid,'guangfo' as created_by,
+               a.id as wxxmguid,'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,ifnull(a.repair_item_id,'') as wxxmh,