add

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

@@ -406,7 +406,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                         ItfTblWangdianWxgDownload::getWxgmc,
                         ItfTblWangdianWxgDownload::getYddh,
                         ItfTblWangdianWxgDownload::getFlag)
-                .eq(ItfTblWangdianWxgDownload::getWdno,"S21A0365")// 测试用 todo
+                // .eq(ItfTblWangdianWxgDownload::getWdno,"S21A0365")// 测试用
                 .eq(ItfTblWangdianWxgDownload::getFlag,DictTypeEnum.DICT_TYPE_FLAG_ON.getCode())
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
@@ -1343,38 +1343,26 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         List<WorkerServiceCategoryDetail> wscdList = new ArrayList<>();
 
         for (WorkerBrandAccount i:workerBrandAccounts){
-
-            log.info("师傅服务类目 d");
             // 提取本地商户师傅信息 网点｜师傅编号不存在不处理 修改处已做了处理 这里只新增(前提是找到师傅所在网点信息)
             WorkerBrandAccount workerBrandAccount = getWorkerBrandAccountData(workerBrandAccounts, wxgDownload);
             if (workerBrandAccount == null){
                 continue;
             }
-
-            log.info("师傅服务类目 e");
             // 师傅对应的网点服务类目信息已存在不处理 只做插入
             if (workerServiceCategoryDetailMap.containsKey(workerBrandAccount.getWebsitWorkerId())){
                 continue;
             }
 
-            log.info("师傅服务类目 f");
             // 师傅对应的网点服务类目信息已存在不处理 只做插入
             if (workerServiceCategoryDetailList.contains(workerBrandAccount.getWebsitWorkerId())){
-                log.info("只做新增 ");
                 continue;
             }
 
-            log.info("师傅信息 {}",JSONObject.toJSONString(i));
-
-
             // 参数 获取网点维修工信息
             getParameter(wxgDownload.getWdno(), wxgDownload.getWxgno(), req);
             try {
                 // 格力总部查询工程师信息
                 GreeResponseHelper response = greeLogic.greePost(wdqyapi, JSONObject.toJSONString(req), publicService.getCompanyId(wxgDownload.getWdno()));
-
-                log.info("师傅信息查询结果 {}",JSONObject.toJSONString(response));
-
                 if (response.getStatus() == 200){
                     WxgQueryInfo resultDatax = JSONObject.parseObject(response.getData().toString(), WxgQueryInfo.class);
                     // 无信息不处理
@@ -1403,11 +1391,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     getServiceCategory(wvos, wscList, wscdList, sysDict, wxgDownload, wxgCategoryTypeRecs,
                             sysDictRefMap, workerBrandAccount, workerServiceCategoryDetailList);
 
-                    log.info("本次新增的服务类目 {}",JSONObject.toJSONString(workerServiceCategoryDetailList));
-
-                    log.info("师傅服务类目 {}",JSONObject.toJSONString(wscList));
-                    log.info("师傅服务类别 {}",JSONObject.toJSONString(wscdList));
-
                     // 新增或修改(师傅服务的类目)
                     addDataCategory(wscList, wscdList);
 
@@ -1490,7 +1473,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         WorkerBrandAccount workerBrandAccount = null;
 
         for (WorkerBrandAccount wba: wbarecs){
-            if (wba.getBrandWorkerId().equals(wxg.getWxgid())){
+            if (wba.getBrandWorkerId().equals(String.valueOf(wxg.getWxgid()))){
                 workerBrandAccount = wba;
                 break;
             }

src/main/resources/bootstrap-dev.properties

@@ -371,7 +371,7 @@ wxzjsc=FALSE
 wxzjscxc=FALSE
 #网点维修工 证件照，服务类目，位置、新增同步到本地、修改、保险、总部下载的采集图
 zjzxxc=FALSE
-lmxxc=FALSE
+lmxxc=TRUE
 wxgwzc=FALSE
 wxgxgc=FALSE
 wxgwztc=FALSE
@@ -403,7 +403,7 @@ hsgdcjtmc=FALSE
 #工单数据向上同步
 datauploadc=FALSE
 #安装、维修工单入本地表
-installinc=TRUE
+installinc=FALSE
 repairinc=FALSE
 #完工评价短信格力总部发送，自建工单联通发送，查看评价短信回复信息，自建完工评价短信联通发送，派服务人员格力发送
 wgmsgsendc=FALSE