|
@@ -208,7 +208,7 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
|
|
|
List<WorkerCertGree> wcgs, WorkerCert item,
|
|
|
WorkerBrandAccount wdno, Map<String,String> wcgids) {
|
|
|
WorkerCertGree awc = new WorkerCertGree();
|
|
|
- awc.setWorkerCertGreeId(IdWorker.getIdStr());
|
|
|
+ awc.setWorkerCertGreeId(item.getId());
|
|
|
awc.setWorkerId(wdno.getWorkerId());
|
|
|
awc.setBrandWebsitId(wdno.getBrandWebsitId());
|
|
|
awc.setCertName(item.getCertName());
|
|
@@ -328,7 +328,41 @@ public class UploadWorkeCertificateServiceImpl implements UploadWorkeCertificate
|
|
|
|
|
|
@Override
|
|
|
public Boolean UploadWorkeCert(OutWorkerUpload owu){
|
|
|
- List<WorkerCert> recs = new ArrayList<>();
|
|
|
+
|
|
|
+
|
|
|
+ // 提取师傅的证件数据
|
|
|
+ List<WorkerCert> recs = workerCertService.lambdaQuery()
|
|
|
+ .eq(WorkerCert::getWorkerId,owu.getWorkerId()).list();
|
|
|
+ if (CollectionUtils.isEmpty(recs)){
|
|
|
+ updateOutWorkerUploadError(owu,"师傅证件信息不存在-WorkerCert");
|
|
|
+ return Boolean.FALSE;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 若存在待同步的暂不处理
|
|
|
+ for (WorkerCert item :recs){
|
|
|
+ // 证件已同步无需再次同步或是更新
|
|
|
+ if ((StringUtils.isNotEmpty(item.getFileUrl()) && (StringUtils.isEmpty(item.getOutFileUrl()))) ||
|
|
|
+ (StringUtils.isNotEmpty(item.getFileUrl2()) && (StringUtils.isEmpty(item.getOutFileUrl2())))){
|
|
|
+ updateOutWorkerUploadError(owu,"等待同步证件信息");
|
|
|
+ return Boolean.FALSE;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 查看证件数据是否已生成
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
List<WorkerBrandAccount> workerWdnos = new ArrayList<>();
|
|
|
String filePatho ="";
|
|
|
String filePatht ="";
|