yaozhixue 1 年之前
父节点
当前提交
24fb9ba462

+ 3 - 0
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zfire.jiasm.syncdata.service.impl;
 package com.zfire.jiasm.syncdata.service.impl;
 
 
+import cn.hutool.extra.pinyin.PinyinUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
@@ -701,6 +702,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         v.setWorkerId("S" + m.getYddh());
         v.setWorkerId("S" + m.getYddh());
 
 
         v.setWorkerName(m.getWxgmc().trim());
         v.setWorkerName(m.getWxgmc().trim());
+        v.setFirstWord(PinyinUtil.getPinyin(v.getWorkerName().substring(0,1)).substring(0,1).toUpperCase(Locale.ROOT));
         v.setCreateBy("system");
         v.setCreateBy("system");
         v.setUpdateBy("system");
         v.setUpdateBy("system");
         v.setCreateTime(new Date());
         v.setCreateTime(new Date());
@@ -708,6 +710,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         v.setStatus("OFF");
         v.setStatus("OFF");
         if (flag){
         if (flag){
             v.setStatus("ON");
             v.setStatus("ON");
+            v.setTestFlag("合格");
         }
         }
         /*if (m.getCreatedBy() != null){
         /*if (m.getCreatedBy() != null){
             v.setCreateBy(m.getCreatedBy());
             v.setCreateBy(m.getCreatedBy());

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

@@ -133,7 +133,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         // 提取格力现有的网点师傅数据信息
         // 提取格力现有的网点师傅数据信息
         wxgDownladRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
         wxgDownladRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
                 .eq(ItfTblWangdianWxgDownload::getGreeStatus,0)
                 .eq(ItfTblWangdianWxgDownload::getGreeStatus,0)
-                // .eq(ItfTblWangdianWxgDownload::getSfzen,"421022197809157619")// 测试用
+                // .eq(ItfTblWangdianWxgDownload::getSfzen,"441283199209162787")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
 
 
 

+ 1 - 7
src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkeCertificateServiceImpl.java

@@ -392,13 +392,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
             }
             }
 
 
             // 查看证件数据是否已生成 已生成不再处理
             // 查看证件数据是否已生成 已生成不再处理
-            for (WorkerCertGree wcg : workerbx){
-                if (workerbxList.contains(wcg.getBrandWebsitId() + wcg.getWorkerId() + wcg.getCertName())){
-                    isok = Boolean.TRUE;
-                    break;
-                }
-            }
-            if (isok){
+            if (workerbxList.contains(owu.getBrandWebsitId() + owu.getWorkerId() + item.getCertName())){
                 continue;
                 continue;
             }
             }
 
 

+ 1 - 2
src/main/java/com/zfire/jiasm/syncdata/service/impl/UploadWorkerTOGreeServiceImpl.java

@@ -2005,11 +2005,10 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
         return recs;
         return recs;
     }
     }
 
 
-
     private List<OutWorkerUpload> getWorkerUploadstest() {
     private List<OutWorkerUpload> getWorkerUploadstest() {
         // 同步标志-synStatus(0:待同步;1:已同步;99:同步失败)
         // 同步标志-synStatus(0:待同步;1:已同步;99:同步失败)
         List<OutWorkerUpload> recs = outWorkerUploadService.lambdaQuery()
         List<OutWorkerUpload> recs = outWorkerUploadService.lambdaQuery()
-                .eq(OutWorkerUpload::getSynReqId,35).list();
+                .eq(OutWorkerUpload::getSynReqId,60).list();
         return recs;
         return recs;
     }
     }
 }
 }