From 13240e72c59e5f70daa6a1ab457d44af809e3747 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 10 May 2024 15:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worker/service/impl/WorkerInfoAuditRecordServiceImpl.java | 2 ++
 .../xz/controller/XzWorkerInfoAuditRecordController.java      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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<WorkerInfoAudi
             List<WorkerCertificate> 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<WorkerInsurance> 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<WorkerInfoAuditRecord> adoptWorkerInfo(@RequestBody JSONObject paramMap) {
+        log.info("开始人员下发设备" + paramMap);
 //        List<String> ids = (List<String>) paramMap.get("id");
 //        List<String> ufaceDevId = ufaceDevService.list(Wrappers.<UfaceDev>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<WorkerCertificate> 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<String> ufaceDevId = ufaceDevService.list(Wrappers.<UfaceDev>lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString()))