From 39324ed3df2b6a225c28246709989efc38df1388 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 26 Sep 2025 13:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=AE=E6=94=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8Bbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuEmployeesAdvisoryInfoServiceImpl.java | 17 ++++++++++++++--- .../employees/listener/EmployeesMQListener.java | 8 ++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index 19c6416..c497136 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -2,13 +2,16 @@ package com.nu.modules.employees.service.impl; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.dto.EmployeesApplyMQDto; import com.nu.dto.EmployeesStatusMQDto; import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi; import com.nu.entity.EmployeesAdvisoryInfoEntity; +import com.nu.modules.employees.entity.EmployeesOrg; import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo; import com.nu.modules.employees.mapper.NuEmployeesAdvisoryInfoMapper; +import com.nu.modules.employees.service.IEmployeesOrgService; import com.nu.modules.employees.service.INuEmployeesAdvisoryInfoService; import com.nu.modules.weixin.utils.TemplateMessageSender; import com.nu.modules.weixin.utils.WechatMiniProgramUtils; @@ -21,6 +24,7 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.modules.base.service.BaseCommonService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -43,6 +47,9 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl uw = new UpdateWrapper(); + uw.eq("employees_id",dto.getId()); +// uw.eq("iz_history","1"); +// uw.eq("org_code",dto.getOrgCode()); + EmployeesOrg employeesOrg = new EmployeesOrg(); + employeesOrg.setModifyStatus("1"); + employeesOrgService.update(employeesOrg,uw); //更新员工信息需要有审核流程 审核通过后才修改正式数据 //通知业务平台有员工信息变更 EmployeesApplyMQDto mqdto = new EmployeesApplyMQDto(); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java index 8f51993..33ff41b 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java @@ -191,8 +191,8 @@ public class EmployeesMQListener { //审批通过需要修改员工-机构中间表结果 UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); - uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); +// uw.eq("org_code", dto.getOrgCode()); +// uw.eq("iz_history", "1"); EmployeesOrg eo = new EmployeesOrg(); eo.setModifyStatus("2"); employeesOrgService.update(eo, uw); @@ -234,8 +234,8 @@ public class EmployeesMQListener { //审批不通过只需要修改员工-机构中间表结果 UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); - uw.eq("org_code", dto.getOrgCode()); - uw.eq("iz_history", "1"); +// uw.eq("org_code", dto.getOrgCode()); +// uw.eq("iz_history", "1"); EmployeesOrg eo = new EmployeesOrg(); eo.setModifyStatus("3"); employeesOrgService.update(eo, uw);