add

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

@@ -140,10 +140,10 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
 
                 // 这里需要从对应的网点信息中提取师傅服务区域
                 // 查看师傅服务区域 规定随便取一个地址即可
-                workerStreet = getWorkerStreet(item, worker);
+                /*workerStreet = getWorkerStreet(item, worker);
                 if (workerStreet == null) {
                     continue;
-                }
+                }*/
 
                 // 验证师傅的保险证信息 所有网点都验证 这里只验证是否成功上传了图片
                 if (checkBXOutInsureCert(workerBrandAccount)) {
@@ -228,9 +228,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
                     if (StringUtils.isNotEmpty(dot.getBrandWorkerNumber())){
                         req.setWxgno(dot.getBrandWorkerNumber());
                         // 重置部分数据 以格力门店数据为准
-                        resetParameter(wdwxgGlMap, req,workerStreet);
-                    } else {
-                        extractedPCAS(req, workerStreet);
+                        resetParameter(wdwxgGlMap, req);
                     }
 
                     // 所属网点
@@ -319,14 +317,9 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
     }
 
     private void resetParameter(Map<String, List<ItfTblWangdianPositionDownload>> wdwxgGlMap,
-                                WorkUploadInfo req,
-                                WorkerStreet workerStreet) {
+                                WorkUploadInfo req) {
         if (wdwxgGlMap.containsKey(req.getWxgno())){
             ItfTblWangdianPositionDownload i = wdwxgGlMap.get(req.getWxgno()).get(0);
-            //req.setSfen(i.getSfen());
-            //req.setCshi(i.getCshi());
-            //req.setCounty(i.getCounty());
-            //req.setXzhen(i.getXzhen());
             req.setFlag(i.getFlag());
             req.setFwryzpfj(i.getFwryzpfj());
             req.setGzkkh(i.getGzkkh());