add

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPWXGQueryAddServiceImpl.java

@@ -1342,6 +1342,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         List<WorkerServiceCategory> wscList = new ArrayList<>();
         List<WorkerServiceCategoryDetail> wscdList = new ArrayList<>();
 
+        String brandWorkerIdo = "294773";
+        String brandWorkerIdt = "990003185";
+
         for (WorkerBrandAccount i:workerBrandAccounts){
             // 提取本地商户师傅信息 网点｜师傅编号不存在不处理 修改处已做了处理 这里只新增(前提是找到师傅所在网点信息)
             WorkerBrandAccount workerBrandAccount = getWorkerBrandAccountData(workerBrandAccounts, wxgDownload);
@@ -1358,7 +1361,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 continue;
             }
 
-            if ("294773".equals(i.getBrandWorkerId()) || "990003185".equals(i.getBrandWorkerId())){
+            if (brandWorkerIdo.equals(i.getBrandWorkerId()) || brandWorkerIdt.equals(i.getBrandWorkerId())){
                 log.info("workerBrandAccount {}",workerBrandAccount);
                 log.info("wxgDownload {}",wxgDownload);
             }
@@ -1369,7 +1372,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                 // 格力总部查询工程师信息
                 GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxgDownload.getWdno()));
 
-                if ("294773".equals(i.getBrandWorkerId()) || "990003185".equals(i.getBrandWorkerId())){
+                if (brandWorkerIdo.equals(i.getBrandWorkerId()) || brandWorkerIdt.equals(i.getBrandWorkerId())){
                     log.info("response {}",JSONObject.toJSONString(response));
                 }
 
@@ -1404,7 +1407,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     getServiceCategory(wvos, wscList, wscdList, sysDict, wxgDownload, wxgCategoryTypeRecs,
                             sysDictRefMap, workerBrandAccount, workerServiceCategoryDetailList);
 
-                    if ("294773".equals(i.getBrandWorkerId()) || "990003185".equals(i.getBrandWorkerId())){
+                    if (brandWorkerIdo.equals(i.getBrandWorkerId()) || brandWorkerIdt.equals(i.getBrandWorkerId())){
                         log.info("wscList {}",JSONObject.toJSONString(wscList));
                         log.info("wscdList {}",JSONObject.toJSONString(wscdList));
                     }

src/main/java/com/zfire/jiasm/syncdata/service/impl/InstallProduceDataUploadServiceImpl.java

@@ -187,9 +187,9 @@ public class InstallProduceDataUploadServiceImpl implements InstallProduceDataUp
                         .eq(OutJiasmToGreeUploadTaskList::getSynStatus,0)
                         .eq(OutJiasmToGreeUploadTaskList::getUploadTaskType,uploadTaskType)
 
-                        //.eq(OutJiasmToGreeUploadTaskList::getSynReqId,26208) // 测试用
-                        //.eq(OutJiasmToGreeUploadTaskList::getOrderNo,"A1691659257781723138") // 测试用
-                        //.eq(OutJiasmToGreeUploadTaskList::getTableName,"order_base") // 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getSynReqId,660) // 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getOrderNo,"A1691659257781723138") // 测试用
+                        // .eq(OutJiasmToGreeUploadTaskList::getTableName,"order_base") // 测试用
 
                         .lt(OutJiasmToGreeUploadTaskList::getSynTimes,10)
                         .orderByAsc(OutJiasmToGreeUploadTaskList::getSynReqId).list();

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -1203,7 +1203,7 @@ public class PublicServiceImpl implements PublicService {
 
         WorkerBrandAccount wba = workerBrandAccountService.lambdaQuery()
                 .eq(WorkerBrandAccount::getGroupCompanyId,groupCompanyId)
-                .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON")
+                // .eq(WorkerBrandAccount::getBrandWorkerStatus,"ON") 王总要求去掉在总部状态的判断
                 .eq(WorkerBrandAccount::getDel,0)
                 .eq(WorkerBrandAccount::getWorkerId,workerId)
                 .eq(WorkerBrandAccount::getBrandWebsitId,brandWebsitId)

src/main/java/com/zfire/jiasm/syncdata/service/impl/RepairProduceDataUploadServiceImpl.java

@@ -1378,9 +1378,6 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
                             List<ItfTblWxjsWxxmJyktUpload> wxxms,
                             List<ItfTblAssignFeeUpload> fees){
         // 提取维修项目数据
-        List<OrderRepairDetailItem> ords =  orderRepairDetailItemService.lambdaQuery()
-                .eq(OrderRepairDetailItem::getOrderRepairDetailId, detail.getId()).list();
-
         List<OrderRepairDetailReason> ordrs =  orderRepairDetailReasonService.lambdaQuery()
                 .eq(OrderRepairDetailReason::getOrderBaseId, orderBase.getId()).list();
         for (OrderRepairDetailReason item : ordrs){

src/main/resources/bootstrap-dev.properties

@@ -371,7 +371,7 @@ wxzjsc=FALSE
 wxzjscxc=FALSE
 #网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险、总部下载的采集图
 zjzxxc=FALSE
-lmxxc=TRUE
+lmxxc=FALSE
 wxgwzc=FALSE
 wxgxgc=FALSE
 wxgwztc=FALSE
@@ -388,7 +388,7 @@ glscc=FALSE
 #天猫商城
 tmscc=FALSE
 #安装工单上传  生成需要上传的数据、生成上传任务清单列表
-azuploadyscc=FALSE
+azuploadyscc=TRUE
 azuploadscc=FALSE
 #维修工单上传  生成需要上传的数据、生成上传任务清单列表
 wxuploadyscc=FALSE