diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java index b76008156..48e542fc4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java @@ -25,7 +25,7 @@ public interface IWorkerInfoAuditRecordService extends IService map); + String adoptWorkerInfo(Map map); void rejectWorkerInfo(Map map); 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 77af2961e..4d55479e0 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 @@ -106,7 +106,7 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl map) { + public String adoptWorkerInfo(Map map) { WorkerInfoAuditRecord workerInfoAuditRecord=workerInfoAuditRecordMapper.selectById(MapUtils.getString(map,"id")); if(workerInfoAuditRecord==null){ throw new OpenAlertException(MessageUtil.get("notFindErr")); @@ -125,7 +125,7 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl workerContracts = JSONArray.parseArray(workerInfoAuditRecord.getContractInfo(), WorkerContract.class); 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 ccb5b7c76..9278de2ec 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 @@ -11,6 +11,9 @@ 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.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.service.INoticeService; +import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.edu.service.ISafeEducationQuestionAnswerService; import com.zhgd.xmgl.modules.worker.entity.*; import com.zhgd.xmgl.modules.worker.service.IUfaceDevService; @@ -49,6 +52,12 @@ public class XzWorkerInfoAuditRecordController { @Autowired private IWorkerInfoAuditRecordService workerInfoAuditRecordService; + @Autowired + private INoticeService noticeService; + + @Autowired + private ISystemUserService systemUserService; + @Autowired private ISafeEducationQuestionAnswerService safeEducationQuestionAnswerService; @@ -330,12 +339,22 @@ public class XzWorkerInfoAuditRecordController { paramMap.put("ufaceDevId", ufaceDevIds); paramMap.put("accountType", 2); paramMap.put("registerType", 2); - Long workerId = workerInfoAuditRecordService.adoptWorkerInfo(paramMap); + String workerId = workerInfoAuditRecordService.adoptWorkerInfo(paramMap); if (workerId != null) { + String[] split = workerId.split("#"); LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); wrapper.set(WorkerInfoAuditRecord::getAsyncState, 1); - wrapper.eq(WorkerInfoAuditRecord::getId, workerId); + wrapper.eq(WorkerInfoAuditRecord::getId, split[0]); workerInfoAuditRecordService.update(wrapper); + List systemUserList = systemUserService.list(Wrappers.lambdaQuery().eq(SystemUser::getAccountType, 5)); + systemUserList.addAll(systemUserService.list(Wrappers.lambdaQuery() + .eq(SystemUser::getAccountType, 10) + .eq(SystemUser::getSn, paramMap.getString("projectSn")))); + List collect = systemUserList.stream().map(s -> s.getUserId()).collect(Collectors.toList()); + collect.add(Long.valueOf(paramMap.getString("startUser"))); + for (Long userId : collect) { + noticeService.addUserNotice(userId, "人员同步异常,原因:" + split[1], "人员审批数据同步失败", "1"); + } } } }