From 0d70be2ab82475ee98472c6677116601862f2fdd Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 18 Jun 2024 13:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=A1=E6=89=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=A4=B1=E8=B4=A5=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8A=A0=E4=B8=8A=E5=A7=93=E5=90=8D=E5=92=8C?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XzWorkerInfoAuditRecordController.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) 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 c84561f20..592f283e5 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,12 +1,12 @@ package com.zhgd.xmgl.modules.xz.controller; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 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; @@ -34,8 +34,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @@ -65,6 +67,8 @@ public class XzWorkerInfoAuditRecordController { @Autowired private ISafeEducationQuestionAnswerService safeEducationQuestionAnswerService; + @Resource + private IUfaceDevService ufaceDevService; /** * 分页列表查询 @@ -124,7 +128,6 @@ public class XzWorkerInfoAuditRecordController { return Result.ok(); } - /** * 添加 * @@ -145,12 +148,13 @@ public class XzWorkerInfoAuditRecordController { } /** - * 编辑 + * 编辑 + * * @param workerInfoAuditRecord * @return */ - @OperLog(operModul = "劳务管理",operType = "编辑劳务人员-审核",operDesc = "编辑劳务人员-审核表信息") - @ApiOperation(value = "编辑劳务人员-审核表信息", notes = "编辑劳务人员-审核表信息" , httpMethod="POST") + @OperLog(operModul = "劳务管理", operType = "编辑劳务人员-审核", operDesc = "编辑劳务人员-审核表信息") + @ApiOperation(value = "编辑劳务人员-审核表信息", notes = "编辑劳务人员-审核表信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody WorkerInfoAuditRecord workerInfoAuditRecord) { workerInfoAuditRecordService.editWorkerInfoAuditRecord(workerInfoAuditRecord); @@ -229,9 +233,6 @@ public class XzWorkerInfoAuditRecordController { return result; } - @Resource - private IUfaceDevService ufaceDevService; - @OperLog(operModul = "劳务管理", operType = "劳务人员审核通过", operDesc = "劳务人员审核通过") @ApiOperation(value = "审核通过", notes = "审核通过", httpMethod = "POST") @ApiImplicitParams({ @@ -257,7 +258,7 @@ public class XzWorkerInfoAuditRecordController { List workerIds = new ArrayList<>(); JSONArray ids = paramMap.getJSONArray("id"); 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++) { JSONObject detailObj = new JSONObject(); JSONObject j = ids.getJSONObject(i); @@ -360,8 +361,9 @@ public class XzWorkerInfoAuditRecordController { List collect = systemUserList.stream().map(s -> s.getUserId()).collect(Collectors.toList()); collect.addAll(xzSystemUserToCompanyProjects.stream().map(x -> x.getUserId()).collect(Collectors.toList())); collect.add(Long.valueOf(paramMap.getString("startUser"))); + WorkerInfoAuditRecord wia = workerInfoAuditRecordService.getById(split[0]); for (Long userId : collect) { - noticeService.addUserNotice(userId, "人员同步异常,原因：" + split[1], "人员审批数据同步失败", "1"); + noticeService.addUserNotice(userId, StrUtil.format("人员同步异常,原因：{},姓名：{},身份证号：{}", split[1], wia.getWorkerName(), wia.getIdCard()), "人员审批数据同步失败", "1"); } } }