| 
					
				 | 
			
			
				@@ -324,12 +324,9 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String,Object> req = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String,List<Worker>> workerIdcardMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String,List<Worker>> workerWorkeridMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Map<String,List<WorkerCert>> WorkerCertWorkerIdMaps = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ItfTblWangdianWxgDownload> wxgDownladRecs = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String,String> workerIdCertNamesIdMaps = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String,WorkerCert> workerIdCertNamesObjMaps = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        List<InsureWorkerCommercial> insurecs = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        List<InsureWorkerCommercialFile> insurefiles = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<String> bxWorkerIdWebsitIds = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String,WebsitWorker> websitWorderwidwdidMap = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Map<String,List<WebsitWorker>> addBxWorkers = new HashMap<>(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -343,9 +340,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 提取现有的师傅证件信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<WorkerCert> wcs = workerCertService.lambdaQuery().list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (CollectionUtils.isNotEmpty(wcs)){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -389,7 +383,6 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             iwcs.clear(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Insure insure = publicService.getWebsitWorkerByWorkerAndWebsit("意外险"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<WebsitWorker> wws = websitWorkerService.lambdaQuery().list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (CollectionUtils.isNotEmpty(wws)){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -412,12 +405,13 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 提取现有已存在的证件信息的师傅信息(待回传同步的证件不处理) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        List<WorkerCert> wc = workerCertService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /*List<WorkerCert> wc = workerCertService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(WorkerCert::getOutSyncStatus,1).list(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Map<String,List<WorkerCert>> WorkerCertWorkerIdMaps = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (CollectionUtils.isNotEmpty(wc)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             WorkerCertWorkerIdMaps = wc.stream().collect(Collectors.groupingBy(WorkerCert::getWorkerId)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             wc.clear(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (ItfTblWangdianWxgDownload wxg :wxgDownladRecs){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -465,7 +459,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     // 同步-新增证件信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     getCertInfo(wvos, addList, workerId, wxg.getWdno(), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             workerWorkeridMap, bxWorkerIdWebsitIds, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            websitWorderwidwdidMap, insure,addBxWorkers, upWebsitWorkers, workerIdCertNamesObjMaps); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            websitWorderwidwdidMap, addBxWorkers, upWebsitWorkers, workerIdCertNamesObjMaps); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     // 新增或修改(证件) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     addDataCert(addList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     // 修改保险信息 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1408,15 +1402,12 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                              String wdno, Map<String,List<Worker>> workerWorkeridMap, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                              List<String> bxWorkerIdWebsitIds, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                              Map<String,WebsitWorker> websitWorderwidwdidMap, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                             Insure insure,Map<String,List<WebsitWorker>> addBxWorkers, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                             Map<String,List<WebsitWorker>> addBxWorkers, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                              List<WebsitWorker> upWebsitWorkers, Map<String,WorkerCert> workerIdCertNamesObjMaps) throws ParseException { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 同步-新增证件信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for (ZJInfo zj: wvos.getZjInfoList()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 保险证 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (zj.getZjmc().trim().equals("保险证")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (insure == null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    continue; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 /*// 师傅所在网点数据未下载保险证件时才可以下载 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (!addBxWorkers.containsKey(workerId)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     continue; 
			 |