人员审批数据同步失败通知需要加上姓名和身份证号
This commit is contained in:
parent
2970211be1
commit
0d70be2ab8
@ -1,12 +1,12 @@
|
|||||||
package com.zhgd.xmgl.modules.xz.controller;
|
package com.zhgd.xmgl.modules.xz.controller;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.sun.corba.se.pept.transport.ContactInfo;
|
|
||||||
import com.zhgd.annotation.OperLog;
|
import com.zhgd.annotation.OperLog;
|
||||||
import com.zhgd.jeecg.common.api.vo.Result;
|
import com.zhgd.jeecg.common.api.vo.Result;
|
||||||
import com.zhgd.jeecg.common.mybatis.EntityMap;
|
import com.zhgd.jeecg.common.mybatis.EntityMap;
|
||||||
@ -34,8 +34,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.lang.reflect.Array;
|
import java.util.ArrayList;
|
||||||
import java.util.*;
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
|
||||||
@ -65,6 +67,8 @@ public class XzWorkerInfoAuditRecordController {
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISafeEducationQuestionAnswerService safeEducationQuestionAnswerService;
|
private ISafeEducationQuestionAnswerService safeEducationQuestionAnswerService;
|
||||||
|
@Resource
|
||||||
|
private IUfaceDevService ufaceDevService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
@ -124,7 +128,6 @@ public class XzWorkerInfoAuditRecordController {
|
|||||||
return Result.ok();
|
return Result.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加
|
* 添加
|
||||||
*
|
*
|
||||||
@ -146,11 +149,12 @@ public class XzWorkerInfoAuditRecordController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 编辑
|
* 编辑
|
||||||
|
*
|
||||||
* @param workerInfoAuditRecord
|
* @param workerInfoAuditRecord
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@OperLog(operModul = "劳务管理",operType = "编辑劳务人员-审核",operDesc = "编辑劳务人员-审核表信息")
|
@OperLog(operModul = "劳务管理", operType = "编辑劳务人员-审核", operDesc = "编辑劳务人员-审核表信息")
|
||||||
@ApiOperation(value = "编辑劳务人员-审核表信息", notes = "编辑劳务人员-审核表信息" , httpMethod="POST")
|
@ApiOperation(value = "编辑劳务人员-审核表信息", notes = "编辑劳务人员-审核表信息", httpMethod = "POST")
|
||||||
@PostMapping(value = "/edit")
|
@PostMapping(value = "/edit")
|
||||||
public Result<WorkerInfoAuditRecord> edit(@RequestBody WorkerInfoAuditRecord workerInfoAuditRecord) {
|
public Result<WorkerInfoAuditRecord> edit(@RequestBody WorkerInfoAuditRecord workerInfoAuditRecord) {
|
||||||
workerInfoAuditRecordService.editWorkerInfoAuditRecord(workerInfoAuditRecord);
|
workerInfoAuditRecordService.editWorkerInfoAuditRecord(workerInfoAuditRecord);
|
||||||
@ -229,9 +233,6 @@ public class XzWorkerInfoAuditRecordController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Resource
|
|
||||||
private IUfaceDevService ufaceDevService;
|
|
||||||
|
|
||||||
@OperLog(operModul = "劳务管理", operType = "劳务人员审核通过", operDesc = "劳务人员审核通过")
|
@OperLog(operModul = "劳务管理", operType = "劳务人员审核通过", operDesc = "劳务人员审核通过")
|
||||||
@ApiOperation(value = "审核通过", notes = "审核通过", httpMethod = "POST")
|
@ApiOperation(value = "审核通过", notes = "审核通过", httpMethod = "POST")
|
||||||
@ApiImplicitParams({
|
@ApiImplicitParams({
|
||||||
@ -257,7 +258,7 @@ public class XzWorkerInfoAuditRecordController {
|
|||||||
List<String> workerIds = new ArrayList<>();
|
List<String> workerIds = new ArrayList<>();
|
||||||
JSONArray ids = paramMap.getJSONArray("id");
|
JSONArray ids = paramMap.getJSONArray("id");
|
||||||
JSONArray workerInfo = new JSONArray();
|
JSONArray workerInfo = new JSONArray();
|
||||||
String [] param = {"workerId", "workerName", "enterpriseName", "teamName", "personType", "idCard", "upUrl", "downUrl", "contract", "insurance", "certificate"};
|
String[] param = {"workerId", "workerName", "enterpriseName", "teamName", "personType", "idCard", "upUrl", "downUrl", "contract", "insurance", "certificate"};
|
||||||
for (int i = 0; i < ids.size(); i++) {
|
for (int i = 0; i < ids.size(); i++) {
|
||||||
JSONObject detailObj = new JSONObject();
|
JSONObject detailObj = new JSONObject();
|
||||||
JSONObject j = ids.getJSONObject(i);
|
JSONObject j = ids.getJSONObject(i);
|
||||||
@ -360,8 +361,9 @@ public class XzWorkerInfoAuditRecordController {
|
|||||||
List<Long> collect = systemUserList.stream().map(s -> s.getUserId()).collect(Collectors.toList());
|
List<Long> collect = systemUserList.stream().map(s -> s.getUserId()).collect(Collectors.toList());
|
||||||
collect.addAll(xzSystemUserToCompanyProjects.stream().map(x -> x.getUserId()).collect(Collectors.toList()));
|
collect.addAll(xzSystemUserToCompanyProjects.stream().map(x -> x.getUserId()).collect(Collectors.toList()));
|
||||||
collect.add(Long.valueOf(paramMap.getString("startUser")));
|
collect.add(Long.valueOf(paramMap.getString("startUser")));
|
||||||
|
WorkerInfoAuditRecord wia = workerInfoAuditRecordService.getById(split[0]);
|
||||||
for (Long userId : collect) {
|
for (Long userId : collect) {
|
||||||
noticeService.addUserNotice(userId, "人员同步异常,原因:" + split[1], "人员审批数据同步失败", "1");
|
noticeService.addUserNotice(userId, StrUtil.format("人员同步异常,原因:{},姓名:{},身份证号:{}", split[1], wia.getWorkerName(), wia.getIdCard()), "人员审批数据同步失败", "1");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user