员工信息调整,按钮调整,样式调整,增加重置密码、冻结、解冻功能
This commit is contained in:
parent
7cda635167
commit
3011ff8ae9
|
|
@ -2,6 +2,7 @@ package com.nu.modules.employees.mapper;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import com.nu.dto.EmployeesStatusMQDto;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.nu.modules.employees.entity.EmployeesOrg;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
|
@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||
*/
|
||||
public interface EmployeesOrgMapper extends BaseMapper<EmployeesOrg> {
|
||||
List<EmployeesOrg> getEmployeesOrgListByEmpId(@Param("employeesId") String employeesId);
|
||||
|
||||
int updateByOpenAndOrgCode(@Param("dto") EmployeesStatusMQDto dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nu.modules.employees.mapper.EmployeesOrgMapper">
|
||||
<update id="updateByOpenAndOrgCode">
|
||||
UPDATE nu_biz_employees_org
|
||||
SET update_time= now(),
|
||||
iz_freeze=#{dto.izFreeze}
|
||||
WHERE (open_id = #{dto.openId} AND org_code = #{dto.orgCode})
|
||||
</update>
|
||||
|
||||
<select id="getEmployeesOrgListByEmpId" resultType="com.nu.modules.employees.entity.EmployeesOrg">
|
||||
SELECT
|
||||
a.org_code as orgCode,
|
||||
concat(CASE WHEN RIGHT(b.url, 1) = '/' THEN LEFT(b.url, LENGTH(b.url)) ELSE b.url END, b.context_path ) AS serverUrl,
|
||||
b.depart_name
|
||||
SELECT a.org_code as orgCode,
|
||||
concat(CASE WHEN RIGHT (b.url, 1) = '/' THEN LEFT (b.url, LENGTH (b.url)) ELSE b.url END,
|
||||
b.context_path) AS serverUrl,
|
||||
b.depart_name
|
||||
FROM nu_biz_employees_org a
|
||||
LEFT JOIN sys_depart b
|
||||
ON a.org_code = b.org_code
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.nu.modules.employees.service;
|
||||
|
||||
import com.nu.dto.EmployeesStatusMQDto;
|
||||
import com.nu.modules.employees.entity.EmployeesOrg;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
|
|
@ -13,4 +14,6 @@ import java.util.List;
|
|||
*/
|
||||
public interface IEmployeesOrgService extends IService<EmployeesOrg> {
|
||||
List<EmployeesOrg> getEmployeesOrgListByEmpId(String employeesId);
|
||||
|
||||
void updateByOpenAndOrgCode(EmployeesStatusMQDto dto);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.nu.modules.employees.service.impl;
|
|||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.nu.dto.EmployeesStatusMQDto;
|
||||
import com.nu.entity.EmployeesApplyEntity;
|
||||
import com.nu.modules.EmployeesInfo.api.EmployeesOrgLocalApi;
|
||||
import com.nu.entity.EmployeesOrgApiEntity;
|
||||
|
|
@ -32,6 +33,11 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
|
|||
@Autowired
|
||||
private INuEmployeesAdvisoryInfoService employeesAdvisoryInfoService;
|
||||
|
||||
@Override
|
||||
public void updateByOpenAndOrgCode(EmployeesStatusMQDto dto) {
|
||||
baseMapper.updateByOpenAndOrgCode(dto);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String apply(EmployeesApplyEntity dto) {
|
||||
//先将旧数据置为历史状态
|
||||
|
|
@ -184,4 +190,6 @@ public class EmployeesOrgServiceImpl extends ServiceImpl<EmployeesOrgMapper, Emp
|
|||
public List<EmployeesOrg> getEmployeesOrgListByEmpId(String employeesId){
|
||||
return baseMapper.getEmployeesOrgListByEmpId(employeesId);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -491,7 +491,7 @@ public class EmployeesMQListener {
|
|||
employeeInfo.setStartTime(dto.getStartTime());
|
||||
employeeInfo.setEndTime(dto.getEndTime());
|
||||
employeesAdvisoryInfoService.updateById(employeeInfo);
|
||||
System.out.println("员工咨询表信息修改成功"+employeeInfo);
|
||||
System.out.println("员工咨询表信息修改成功" + employeeInfo);
|
||||
//通知其余机构修改此员工信息 并拉取资源文件
|
||||
LambdaQueryWrapper<EmployeesOrg> qw = new LambdaQueryWrapper<>();
|
||||
qw.select(EmployeesOrg::getOrgCode);
|
||||
|
|
@ -573,4 +573,18 @@ public class EmployeesMQListener {
|
|||
wxNotice.setLogMainInfo("员工信息变更审核");
|
||||
wxNoticeApi.sendWechartMessage_SHENHE(wxNotice, nuWxNotice);
|
||||
}
|
||||
|
||||
/**
|
||||
* 冻结或解冻
|
||||
*
|
||||
* @param dto
|
||||
*/
|
||||
@RabbitListener(bindings = @QueueBinding(value = @Queue(name = "employees.account.freezeOrEnabled", durable = "true"),
|
||||
exchange = @Exchange(name = "hldy.employees", type = ExchangeTypes.DIRECT),
|
||||
key = "employees.account.freezeOrEnabled"), errorHandler = "employeesMQErrorHandler")
|
||||
public void handleFreezeOrEnabled(EmployeesStatusMQDto dto) {
|
||||
EmployeesOrg employeesOrg = new EmployeesOrg();
|
||||
employeesOrg.setIzFreeze(dto.getIzFreeze());
|
||||
employeesOrgService.updateByOpenAndOrgCode(dto);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue