diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java index a69b59747..ba00d7eff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java @@ -124,12 +124,14 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl workerCertificates = JSONArray.parseArray(workerInfoAuditRecord.getSpecialCertificateInfo(), WorkerCertificate.class); for (WorkerCertificate workerCertificate : workerCertificates) { workerCertificate.setWorkerId(workerInfo1.getId()); + workerCertificate.setProjectSn(workerInfoAuditRecord.getProjectSn()); } workerCertificateService.saveBatch(workerCertificates); } if (StringUtils.isNotBlank(workerInfoAuditRecord.getInsuranceInfo())) { List workerInsurances = JSONArray.parseArray(workerInfoAuditRecord.getInsuranceInfo(), WorkerInsurance.class); for (WorkerInsurance workerInsurance : workerInsurances) { + workerInsurance.setProjectSn(workerInfoAuditRecord.getProjectSn()); workerInsurance.setWorkerId(workerInfo1.getId()); } workerInsuranceService.saveBatch(workerInsurances); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java index e16346749..e1e9b5d98 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java @@ -225,6 +225,7 @@ public class XzWorkerInfoAuditRecordController { }) @PostMapping(value = "/adoptWorkerInfo") public Result adoptWorkerInfo(@RequestBody JSONObject paramMap) { + log.info("开始人员下发设备" + paramMap); // List ids = (List) paramMap.get("id"); // List ufaceDevId = ufaceDevService.list(Wrappers.lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString())) // .stream().map(d -> d.getId().toString()).collect(Collectors.toList()); @@ -266,7 +267,7 @@ public class XzWorkerInfoAuditRecordController { WorkerInsurance workerInsurance = new WorkerInsurance(); workerInsurance.setPhotoUrl(object.getJSONArray("insurance").getJSONObject(0).getString("url")); insuranceList.add(workerInsurance); - infoAuditRecord.setInsuranceInfo(JSON.toJSONString(workerInsurance)); + infoAuditRecord.setInsuranceInfo(JSON.toJSONString(insuranceList)); List certificateList = new ArrayList<>(); JSONArray certificate = object.getJSONArray("certificate"); @@ -285,6 +286,7 @@ public class XzWorkerInfoAuditRecordController { certificateList.add(workerCertificate); } infoAuditRecord.setSpecialCertificateInfo(JSON.toJSONString(certificateList)); + workerInfoAuditRecordService.updateById(infoAuditRecord); } List ufaceDevId = ufaceDevService.list(Wrappers.lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString()))