add

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

@@ -324,7 +324,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         String workerId="";
         if (workerIdcardMap.containsKey(wxg.getSfzen())){
             for (Worker w: workerIdcardMap.get(wxg.getSfzen())){
-                if (w.getWorkerName().equals(wxg.getWxgmc()) && w.getMobile().equals(wxg.getYddh())){
+                if (w.getWorkerName().equals(wxg.getWxgmc().trim()) && w.getMobile().equals(wxg.getYddh())){
                     workerId = w.getWorkerId();
                     break;
                 }
@@ -455,7 +455,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         WorkerBrandAccount add = new WorkerBrandAccount();
 
         for (Worker w:workerIdCardMap.get(m.getSfzen())){
-            if (w.getWorkerName().equals(m.getWxgmc()) && w.getMobile().equals(m.getYddh())){
+            if (w.getWorkerName().equals(m.getWxgmc().trim()) && w.getMobile().equals(m.getYddh())){
                 add.setWorkerId(w.getWorkerId());
                 break;
             }
@@ -509,14 +509,14 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         if (workerIdcardMap.containsKey(m.getSfzen())){
             // v.setWorkerId(workerIdcardMap.get(m.getSfzen()).get(0).getWorkerId());
             for (Worker w:workerIdcardMap.get(m.getSfzen())){
-                if (w.getWorkerName().equals(m.getWxgmc()) && w.getMobile().equals(m.getYddh())){
+                if (w.getWorkerName().equals(m.getWxgmc().trim()) && w.getMobile().equals(m.getYddh())){
                     v.setWorkerId(w.getWorkerId());
                     flag = Boolean.TRUE;
                     break;
                 }
             }
         }
-        v.setWorkerName(m.getWxgmc());
+        v.setWorkerName(m.getWxgmc().trim());
         //v.setIsReal("YES");
         // v.setFddReal("NO");
         // v.setFddSerialNo();
@@ -603,7 +603,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             v.setSyncFlag(1);
         }
         addWorkerRec.add(v);
-        sfzens.add(m.getSfzen() + m.getWxgmc() + m.getYddh());
+        sfzens.add(m.getSfzen() + m.getWxgmc().trim() + m.getYddh());
     }
 
 
@@ -613,9 +613,9 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         Worker o = null;
 
         // 师傅身份证,名称，电话 已存在为修改
-        if (workerIdcardMap.containsKey(m.getSfzen() + m.getWxgmc() + m.getYddh())){
+        if (workerIdcardMap.containsKey(m.getSfzen() + m.getWxgmc().trim() + m.getYddh())){
             o = workerService.lambdaQuery()
-                    .eq(Worker::getWorkerId,workerIdcardMap.get(m.getSfzen() + m.getWxgmc() + m.getYddh())).one();
+                    .eq(Worker::getWorkerId,workerIdcardMap.get(m.getSfzen() + m.getWxgmc().trim() + m.getYddh())).one();
         }
 
         // 新增
@@ -625,12 +625,12 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
             // 看有无修改的可能
             upWorkerInfo(addWorkerRec, m, o);
         }
-        sfzens.add(m.getSfzen() + m.getWxgmc() + m.getYddh());
+        sfzens.add(m.getSfzen() + m.getWxgmc().trim() + m.getYddh());
     }
 
     private void addWorkerInfo(List<Worker> addWorkerRec, ItfTblWangdianWxgDownload m, Worker v) {
         v.setWorkerId(IdWorker.getIdStr());
-        v.setWorkerName(m.getWxgmc());
+        v.setWorkerName(m.getWxgmc().trim());
         v.setCreateBy("system");
         v.setUpdateBy("system");
         v.setCreateTime(new Date());
@@ -675,14 +675,14 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         Worker o = new Worker();
         MyBeanUtils.copyProperties(v,o);
         Boolean uflag = Boolean.FALSE;
-        if (StringUtils.isNotEmpty(v.getWorkerName()) && StringUtils.isNotEmpty(m.getWxgmc())){
-            if (! v.getWorkerName().equals(m.getWxgmc())){
-                v.setWorkerName(m.getWxgmc());
+        if (StringUtils.isNotEmpty(v.getWorkerName()) && StringUtils.isNotEmpty(m.getWxgmc().trim())){
+            if (! v.getWorkerName().equals(m.getWxgmc().trim())){
+                v.setWorkerName(m.getWxgmc().trim());
                 uflag = Boolean.TRUE;
             }
         } else {
-            if (StringUtils.isNotEmpty(m.getWxgmc())){
-                v.setWorkerName(m.getWxgmc());
+            if (StringUtils.isNotEmpty(m.getWxgmc().trim())){
+                v.setWorkerName(m.getWxgmc().trim());
                 uflag = Boolean.TRUE;
             }
          }
@@ -886,7 +886,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         }
 
         for (ItfTblWangdianWxgDownload m : addRec){
-            if (m.getWxgmc().equals("测试用") && m.getSfzen().equals("441900199605311999") && m.getYddh().equals("123")){
+            if (m.getWxgmc().trim().equals("测试用") && m.getSfzen().equals("441900199605311999") && m.getYddh().equals("123")){
                 continue;
             }
             /*if (m.getSynReqId().equals(39L)){

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

@@ -122,7 +122,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
 
         for (ItfTblWangdianWxgDownload wxg :wxgDownladRecs){
             // 防止 ItfTblWangdianWxgDownload表有重复记录
-            if (wxgs.contains(wxg.getSfzen() + wxg.getWxgmc() + wxg.getYddh())){
+            if (wxgs.contains(wxg.getSfzen() + wxg.getWxgmc().trim() + wxg.getYddh())){
                 continue;
             }
 
@@ -162,7 +162,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     getCertInfo(wvos, addList, workerId, workerWorkeridMap.get(workerId).get(0).getWorkerName());
                     // 新增或修改(证件)
                     addDataCert(addList);
-                    wxgs.add(wxg.getSfzen() + wxg.getWxgmc() + wxg.getYddh());
+                    wxgs.add(wxg.getSfzen() + wxg.getWxgmc().trim() + wxg.getYddh());
                 } catch (Exception ex) {
                     ex.printStackTrace();
                     log.info("工程师证件照信息同步失败-师傅证件信息:{}", wxg.getSfzen());
@@ -177,7 +177,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         String workerId="";
         if (workerIdcardMap.containsKey(wxg.getSfzen())){
             for (Worker w: workerIdcardMap.get(wxg.getSfzen())){
-                if (w.getWorkerName().equals(wxg.getWxgmc()) && w.getMobile().equals(wxg.getYddh())){
+                if (w.getWorkerName().equals(wxg.getWxgmc().trim()) && w.getMobile().equals(wxg.getYddh())){
                     workerId = w.getWorkerId();
                     break;
                 }