admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
pengjie 2024-05-10 15:25:21 +08:00
parent bb08951cf8
commit 13240e72c5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java
View File

@ -124,12 +124,14 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl<WorkerInfoAudi
List<WorkerCertificate> workerCertificates = JSONArray.parseArray(workerInfoAuditRecord.getSpecialCertificateInfo(), WorkerCertificate.class); List<WorkerCertificate> workerCertificates = JSONArray.parseArray(workerInfoAuditRecord.getSpecialCertificateInfo(), WorkerCertificate.class);
for (WorkerCertificate workerCertificate : workerCertificates) { for (WorkerCertificate workerCertificate : workerCertificates) {
workerCertificate.setWorkerId(workerInfo1.getId()); workerCertificate.setWorkerId(workerInfo1.getId());
workerCertificate.setProjectSn(workerInfoAuditRecord.getProjectSn());
} }
workerCertificateService.saveBatch(workerCertificates); workerCertificateService.saveBatch(workerCertificates);
} }
if (StringUtils.isNotBlank(workerInfoAuditRecord.getInsuranceInfo())) { if (StringUtils.isNotBlank(workerInfoAuditRecord.getInsuranceInfo())) {
List<WorkerInsurance> workerInsurances = JSONArray.parseArray(workerInfoAuditRecord.getInsuranceInfo(), WorkerInsurance.class); List<WorkerInsurance> workerInsurances = JSONArray.parseArray(workerInfoAuditRecord.getInsuranceInfo(), WorkerInsurance.class);
for (WorkerInsurance workerInsurance : workerInsurances) { for (WorkerInsurance workerInsurance : workerInsurances) {
workerInsurance.setProjectSn(workerInfoAuditRecord.getProjectSn());
workerInsurance.setWorkerId(workerInfo1.getId()); workerInsurance.setWorkerId(workerInfo1.getId());
} }
workerInsuranceService.saveBatch(workerInsurances); workerInsuranceService.saveBatch(workerInsurances);

4
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java
View File

@ -225,6 +225,7 @@ public class XzWorkerInfoAuditRecordController {
}) })
@PostMapping(value = "/adoptWorkerInfo") @PostMapping(value = "/adoptWorkerInfo")
public Result<WorkerInfoAuditRecord> adoptWorkerInfo(@RequestBody JSONObject paramMap) { public Result<WorkerInfoAuditRecord> adoptWorkerInfo(@RequestBody JSONObject paramMap) {
log.info("开始人员下发设备" + paramMap);
// List<String> ids = (List<String>) paramMap.get("id"); // List<String> ids = (List<String>) paramMap.get("id");
// List<String> ufaceDevId = ufaceDevService.list(Wrappers.<UfaceDev>lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString())) // List<String> ufaceDevId = ufaceDevService.list(Wrappers.<UfaceDev>lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString()))
// .stream().map(d -> d.getId().toString()).collect(Collectors.toList()); // .stream().map(d -> d.getId().toString()).collect(Collectors.toList());
@ -266,7 +267,7 @@ public class XzWorkerInfoAuditRecordController {
WorkerInsurance workerInsurance = new WorkerInsurance(); WorkerInsurance workerInsurance = new WorkerInsurance();
workerInsurance.setPhotoUrl(object.getJSONArray("insurance").getJSONObject(0).getString("url")); workerInsurance.setPhotoUrl(object.getJSONArray("insurance").getJSONObject(0).getString("url"));
insuranceList.add(workerInsurance); insuranceList.add(workerInsurance);
infoAuditRecord.setInsuranceInfo(JSON.toJSONString(workerInsurance)); infoAuditRecord.setInsuranceInfo(JSON.toJSONString(insuranceList));
List<WorkerCertificate> certificateList = new ArrayList<>(); List<WorkerCertificate> certificateList = new ArrayList<>();
JSONArray certificate = object.getJSONArray("certificate"); JSONArray certificate = object.getJSONArray("certificate");
@ -285,6 +286,7 @@ public class XzWorkerInfoAuditRecordController {
certificateList.add(workerCertificate); certificateList.add(workerCertificate);
} }
infoAuditRecord.setSpecialCertificateInfo(JSON.toJSONString(certificateList)); infoAuditRecord.setSpecialCertificateInfo(JSON.toJSONString(certificateList));
workerInfoAuditRecordService.updateById(infoAuditRecord);
} }
List<String> ufaceDevId = ufaceDevService.list(Wrappers.<UfaceDev>lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString())) List<String> ufaceDevId = ufaceDevService.list(Wrappers.<UfaceDev>lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString()))