|
@@ -114,6 +114,9 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
|
|
// 获取待同步数据
|
|
// 获取待同步数据
|
|
recs = getWorkerUploads();
|
|
recs = getWorkerUploads();
|
|
|
|
|
|
|
|
+ // 测试用
|
|
|
|
+ // recs = getWorkerUploadstest();
|
|
|
|
+
|
|
for (OutWorkerUpload item:recs){
|
|
for (OutWorkerUpload item:recs){
|
|
try{
|
|
try{
|
|
WorkUploadInfo req = new WorkUploadInfo();
|
|
WorkUploadInfo req = new WorkUploadInfo();
|
|
@@ -705,7 +708,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
|
|
|
|
|
|
// true为有信息
|
|
// true为有信息
|
|
private Boolean getgkzBak(WorkerCertificateInfo workerCertificateInfo, String workerId) throws ParseException {
|
|
private Boolean getgkzBak(WorkerCertificateInfo workerCertificateInfo, String workerId) throws ParseException {
|
|
- WorkerCert certificate = getCertificateInfo(workerId,"高空证");
|
|
|
|
|
|
+ WorkerCert certificate = getCertificateInfo(workerId,"高空作业证");
|
|
// 无证件不处理
|
|
// 无证件不处理
|
|
if (certificate == null){
|
|
if (certificate == null){
|
|
return Boolean.TRUE;
|
|
return Boolean.TRUE;
|
|
@@ -736,7 +739,7 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
|
|
WorkerCertGree wcg = null;
|
|
WorkerCertGree wcg = null;
|
|
|
|
|
|
for (WorkerCertGree item :wcgs){
|
|
for (WorkerCertGree item :wcgs){
|
|
- if ("高空证".equals(item.getCertName())){
|
|
|
|
|
|
+ if ("高空作业证".equals(item.getCertName())){
|
|
wcg= item;
|
|
wcg= item;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
@@ -1541,4 +1544,12 @@ public class UploadWorkerTOGreeServiceImpl implements UploadWorkerTOGreeService
|
|
recs = outWorkerUploadService.list(queryWrapper);
|
|
recs = outWorkerUploadService.list(queryWrapper);
|
|
return recs;
|
|
return recs;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ private List<OutWorkerUpload> getWorkerUploadstest() {
|
|
|
|
+ // 同步标志-synStatus(0:待同步;1:已同步;99:同步失败)
|
|
|
|
+ List<OutWorkerUpload> recs = outWorkerUploadService.lambdaQuery()
|
|
|
|
+ .eq(OutWorkerUpload::getSynReqId,1).list();
|
|
|
|
+ return recs;
|
|
|
|
+ }
|
|
}
|
|
}
|