yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

员工修改流程bug修复

This commit is contained in:
1378012178@qq.com 2025-09-26 13:34:48 +08:00
parent b343a7e0b7
commit 39324ed3df
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
View File

@ -2,13 +2,16 @@ package com.nu.modules.employees.service.impl;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.dto.EmployeesApplyMQDto; import com.nu.dto.EmployeesApplyMQDto;
import com.nu.dto.EmployeesStatusMQDto; import com.nu.dto.EmployeesStatusMQDto;
import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi; import com.nu.modules.EmployessInfo.api.IEmployessAdvisioryInfoApi;
import com.nu.entity.EmployeesAdvisoryInfoEntity; import com.nu.entity.EmployeesAdvisoryInfoEntity;
import com.nu.modules.employees.entity.EmployeesOrg;
import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo; import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
import com.nu.modules.employees.mapper.NuEmployeesAdvisoryInfoMapper; 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.employees.service.INuEmployeesAdvisoryInfoService;
import com.nu.modules.weixin.utils.TemplateMessageSender; import com.nu.modules.weixin.utils.TemplateMessageSender;
import com.nu.modules.weixin.utils.WechatMiniProgramUtils; 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.jeecg.modules.base.service.BaseCommonService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.HashMap; import java.util.HashMap;
@ -43,6 +47,9 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
private ISysBaseAPI sysBaseAPI; private ISysBaseAPI sysBaseAPI;
@Autowired @Autowired
private RabbitMQUtil rabbitMQUtil; private RabbitMQUtil rabbitMQUtil;
@Lazy
@Autowired
private IEmployeesOrgService employeesOrgService;
@Override @Override
public EmployeesAdvisoryInfoEntity insert(EmployeesAdvisoryInfoEntity EmployeesAdvisoryInfoEntity) { public EmployeesAdvisoryInfoEntity insert(EmployeesAdvisoryInfoEntity EmployeesAdvisoryInfoEntity) {
@ -55,9 +62,13 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
@Override @Override
public int updateById(EmployeesAdvisoryInfoEntity dto) { public int updateById(EmployeesAdvisoryInfoEntity dto) {
// NuEmployeesAdvisoryInfo NuEmployeesAdvisoryInfo = new NuEmployeesAdvisoryInfo(); UpdateWrapper<EmployeesOrg> uw = new UpdateWrapper<EmployeesOrg>();
// BeanUtils.copyProperties(dto,NuEmployeesAdvisoryInfo); uw.eq("employees_id",dto.getId());
// baseMapper.updateById(NuEmployeesAdvisoryInfo); // 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(); EmployeesApplyMQDto mqdto = new EmployeesApplyMQDto();

8
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java
View File

@ -191,8 +191,8 @@ public class EmployeesMQListener {
//审批通过需要修改员工-机构中间表结果 //审批通过需要修改员工-机构中间表结果
UpdateWrapper<EmployeesOrg> uw = new UpdateWrapper<>(); UpdateWrapper<EmployeesOrg> uw = new UpdateWrapper<>();
uw.eq("employees_id", dto.getEmployeeId()); uw.eq("employees_id", dto.getEmployeeId());
uw.eq("org_code", dto.getOrgCode()); // uw.eq("org_code", dto.getOrgCode());
uw.eq("iz_history", "1"); // uw.eq("iz_history", "1");
EmployeesOrg eo = new EmployeesOrg(); EmployeesOrg eo = new EmployeesOrg();
eo.setModifyStatus("2"); eo.setModifyStatus("2");
employeesOrgService.update(eo, uw); employeesOrgService.update(eo, uw);
@ -234,8 +234,8 @@ public class EmployeesMQListener {
//审批不通过只需要修改员工-机构中间表结果 //审批不通过只需要修改员工-机构中间表结果
UpdateWrapper<EmployeesOrg> uw = new UpdateWrapper<>(); UpdateWrapper<EmployeesOrg> uw = new UpdateWrapper<>();
uw.eq("employees_id", dto.getEmployeeId()); uw.eq("employees_id", dto.getEmployeeId());
uw.eq("org_code", dto.getOrgCode()); // uw.eq("org_code", dto.getOrgCode());
uw.eq("iz_history", "1"); // uw.eq("iz_history", "1");
EmployeesOrg eo = new EmployeesOrg(); EmployeesOrg eo = new EmployeesOrg();
eo.setModifyStatus("3"); eo.setModifyStatus("3");
employeesOrgService.update(eo, uw); employeesOrgService.update(eo, uw);