diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml
index faa62fc64..e68c91d2c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml
@@ -86,9 +86,12 @@
and a.is_exam_pass=#{param.isExamPass}
- AND contract_info IS NOT NULL
- AND special_certificate_info IS NOT NULL
- AND insurance_info IS NOT NULL
+
+ and a.id=#{param.workerId}
+
+-- AND contract_info IS NOT NULL
+-- AND special_certificate_info IS NOT NULL
+-- AND insurance_info IS NOT NULL
order by a.id desc
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 7fb049d07..e16346749 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
@@ -1,17 +1,17 @@
package com.zhgd.xmgl.modules.xz.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sun.corba.se.pept.transport.ContactInfo;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.entity.vo.SafeEducationQuestionAnswerDataVo;
import com.zhgd.xmgl.modules.edu.service.ISafeEducationQuestionAnswerService;
-import com.zhgd.xmgl.modules.worker.entity.UfaceDev;
-import com.zhgd.xmgl.modules.worker.entity.WorkerInfoAuditRecord;
-import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducationWorker;
+import com.zhgd.xmgl.modules.worker.entity.*;
import com.zhgd.xmgl.modules.worker.service.IUfaceDevService;
import com.zhgd.xmgl.modules.worker.service.IWorkerInfoAuditRecordService;
import com.zhgd.xmgl.util.MessageUtil;
@@ -224,13 +224,74 @@ public class XzWorkerInfoAuditRecordController {
@ApiImplicitParam(name = "ufaceDevId", value = "人脸设备表ID", paramType = "body", required = false, dataType = "String"),
})
@PostMapping(value = "/adoptWorkerInfo")
- public Result adoptWorkerInfo(@RequestBody Map paramMap) {
- List ids = (List) paramMap.get("id");
+ public Result adoptWorkerInfo(@RequestBody JSONObject 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());
+// if (ufaceDevId.size() > 0) {
+// String ufaceDevIds = ufaceDevId.stream().collect(Collectors.joining(","));
+// for (String id : ids) {
+// paramMap.put("id", id);
+// paramMap.put("ufaceDevId", ufaceDevIds);
+// paramMap.put("accountType", 2);
+// paramMap.put("registerType", 2);
+// workerInfoAuditRecordService.adoptWorkerInfo(paramMap);
+// }
+// }
+ List workerIds = new ArrayList<>();
+ JSONArray ids = paramMap.getJSONArray("id");
+ JSONArray workerInfo = new JSONArray();
+ String [] param = {"workerId", "enterpriseName", "teamName", "personType", "idCard", "contract", "insurance", "certificate"};
+ for (int i = 0; i < ids.size(); i++) {
+ JSONObject detailObj = new JSONObject();
+ JSONObject j = ids.getJSONObject(i);
+ int k = 0;
+ for (String s : j.keySet()) {
+ detailObj.put(param[k], j.get(s));
+ k++;
+ }
+ workerInfo.add(detailObj);
+ }
+ for (Object o : workerInfo) {
+ JSONObject object = JSONObject.parseObject(JSON.toJSONString(o));
+ String workerId = object.getJSONArray("workerId").get(0).toString();
+ workerIds.add(workerId);
+ WorkerInfoAuditRecord infoAuditRecord = workerInfoAuditRecordService.getById(workerId);
+ List contractList = new ArrayList<>();
+ WorkerContract workerContract = new WorkerContract();
+ workerContract.setImageUrl(object.getJSONArray("contract").getJSONObject(0).getString("url"));
+ contractList.add(workerContract);
+ infoAuditRecord.setContractInfo(JSON.toJSONString(contractList));
+ List insuranceList = new ArrayList<>();
+ WorkerInsurance workerInsurance = new WorkerInsurance();
+ workerInsurance.setPhotoUrl(object.getJSONArray("insurance").getJSONObject(0).getString("url"));
+ insuranceList.add(workerInsurance);
+ infoAuditRecord.setInsuranceInfo(JSON.toJSONString(workerInsurance));
+
+ List certificateList = new ArrayList<>();
+ JSONArray certificate = object.getJSONArray("certificate");
+ for (int i = 0; i < certificate.size(); i++) {
+ WorkerCertificate workerCertificate = new WorkerCertificate();
+ JSONObject jsonObject = certificate.getJSONObject(i);
+ int p = 0;
+ for (String s : jsonObject.keySet()) {
+ if (p == 0) {
+ workerCertificate.setCertificateType(Integer.parseInt(jsonObject.getJSONArray(s).get(0).toString()));
+ } else {
+ workerCertificate.setPhotoUrl(jsonObject.getJSONArray(s).getJSONObject(0).getString("url"));
+ }
+ p ++;
+ }
+ certificateList.add(workerCertificate);
+ }
+ infoAuditRecord.setSpecialCertificateInfo(JSON.toJSONString(certificateList));
+ }
+
List ufaceDevId = ufaceDevService.list(Wrappers.lambdaQuery().eq(UfaceDev::getProjectSn, paramMap.get("projectSn").toString()))
.stream().map(d -> d.getId().toString()).collect(Collectors.toList());
if (ufaceDevId.size() > 0) {
String ufaceDevIds = ufaceDevId.stream().collect(Collectors.joining(","));
- for (String id : ids) {
+ for (String id : workerIds) {
paramMap.put("id", id);
paramMap.put("ufaceDevId", ufaceDevIds);
paramMap.put("accountType", 2);
diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
index b33a83911..a0c8934f6 100644
--- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
+++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
@@ -366,6 +366,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/xmgl/carInfo/save").permitAll()
.antMatchers("/xmgl/xzElectrical/**").permitAll()
.antMatchers("/xmgl/xzVisitorManageRecord/save").permitAll()
+ .antMatchers("/xmgl/xzWorkerInfoAuditRecord/viewWorkerInfoDetail").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证.
.and()