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