yaozhixue 1 рік тому
батько
коміт
bf825a0228

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

@@ -332,7 +332,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         }
 
         // 提取现有的师傅证件信息
-        List<WorkerCert> wcs = workerCertService.lambdaQuery().select(WorkerCert::getWorkerId,WorkerCert::getCertName).list();
+        List<WorkerCert> wcs = workerCertService.lambdaQuery().list();
         if (CollectionUtils.isNotEmpty(wcs)){
             wcs.stream().forEach(event->{
                 workerIdCertNamesObjMaps.put(event.getWorkerId() + event.getCertName(),event);
@@ -359,7 +359,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         // 提取格力现有的网点师傅数据信息
         wxgDownladRecs =  itfTblWangdianWxgDownloadService.lambdaQuery()
                 .eq(ItfTblWangdianWxgDownload::getCertStatus,0)
-                // .eq(ItfTblWangdianWxgDownload::getSfzen,"430421198107039037")// 测试用
+                // .eq(ItfTblWangdianWxgDownload::getSfzen,"440785199006194614")// 测试用
                 .like(ItfTblWangdianWxgDownload::getWdno,"S%").list();
 
 
@@ -407,7 +407,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
                     log.info("msg:{}", response.getMsg());
                 }
             } catch (Exception ex) {
-                //ex.printStackTrace();
+                ex.printStackTrace();
                 log.info("工程师证件照信息同步失败-师傅证件信息:{}", wxg.getSfzen());
                 throw new Exception("工程师证件照信息同步失败");
 
@@ -417,7 +417,7 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void addBxInfoBak(List<InsureWorkerCommercial> insurecs, List<InsureWorkerCommercialFile> insurefiles) {
+    public void addBxInfoBak(@NotNull List<InsureWorkerCommercial> insurecs, List<InsureWorkerCommercialFile> insurefiles) {
         if (insurecs.size()>0){
             insureWorkerCommercialService.saveOrUpdateBatch(insurecs);
             insurecs.clear();
@@ -1796,7 +1796,8 @@ public class GLPPWXGQueryAddServiceImpl implements GLPPWXGQueryAddService {
         if (workerIdCertNamesObjMaps.containsKey(workerId + zj.getZjmc())){
             // 看证件图是否需要更新
             setOutZjljProcessOther(workerId, workerIdCertNamesObjMaps, zj, add);
-            add.setId(workerIdCertNamesObjMaps.get(workerId + zj.getZjmc()).getId());
+            WorkerCert o = workerIdCertNamesObjMaps.get(workerId + zj.getZjmc());
+            add.setId(o.getId());
         }
 
         workerIdCertNamesObjMaps.put(workerId + zj.getZjmc(),add);

+ 2 - 2
src/main/resources/bootstrap-prdt.properties

@@ -296,7 +296,7 @@ SMSSelf_marketing_Rate=5000
 ######################## 同步定时任务配置 ########################
 #师傅 证件、师傅、工单子表信息
 workercertificatec=FALSE
-workerceruploadc=TRUE
+workerceruploadc=FALSE
 detaildownc=FALSE
 workercertbxc=FALSE
 #回收工单下载、获取工单的反馈明细数据、(获取对应的采集数据、附件数据、条码明细数据)、与总部进行确认下载完成、同步到业务表
@@ -370,7 +370,7 @@ ththhgxc=FALSE
 wxzjsc=FALSE
 wxzjscxc=FALSE
 #网点维修工 证件照,服务类目,位置、新增同步到本地、修改、保险、总部下载的采集图
-zjzxxc=FALSE
+zjzxxc=TRUE
 lmxxc=FALSE
 wxgwzc=FALSE
 wxgxgc=FALSE

+ 1 - 1
src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=prd
+spring.profiles.active=prdt
 spring.application.name=jiasm-syncdata
 spring.main.allow-bean-definition-overriding=true
 # 修改线程池的拒绝策略