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

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-06-20 11:47:32 +08:00
commit 81a877712d
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,19 +242,6 @@ 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());
// 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<String> workerIds = new ArrayList<>();
JSONArray ids = paramMap.getJSONArray("id");
JSONArray workerInfo = new JSONArray();
@ -275,6 +262,9 @@ public class XzWorkerInfoAuditRecordController {
String workerId = object.getJSONArray("workerId").get(0).toString();
workerIds.add(workerId);
WorkerInfoAuditRecord infoAuditRecord = workerInfoAuditRecordService.getById(workerId);
if (infoAuditRecord == null) {
continue;
}
List<WorkerContract> contractList = new ArrayList<>();
JSONArray contract = object.getJSONArray("contract");
if (contract != null) {