diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/classenum/StaffWagesStateEnum.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/classenum/StaffWagesStateEnum.java new file mode 100644 index 00000000..eb42d8c6 --- /dev/null +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/classenum/StaffWagesStateEnum.java @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye + ******************************************************************************/ + +package com.skyeye.personnel.classenum; + +import com.skyeye.common.base.classenum.SkyeyeEnumClass; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +/** + * @ClassName: StaffWagesStateEnum + * @Description: 员工薪资设定状态枚举类 + * @author: skyeye云系列--卫志强 + * @date: 2023/2/26 12:09 + * @Copyright: 2023 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +@Getter +@NoArgsConstructor +@AllArgsConstructor +public enum StaffWagesStateEnum implements SkyeyeEnumClass { + + WAIT_DESIGN_WAGES(1, "待设定", true, true), + TOO_DESIGN_WAGES(2, "已设定", true, false); + + private Integer key; + + private String value; + + private Boolean show; + + private Boolean isDefault; + +} diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/controller/SysEveUserStaffController.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/controller/SysEveUserStaffController.java index 63b06e6e..cf64c406 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/controller/SysEveUserStaffController.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/controller/SysEveUserStaffController.java @@ -8,10 +8,10 @@ import com.skyeye.annotation.api.Api; import com.skyeye.annotation.api.ApiImplicitParam; import com.skyeye.annotation.api.ApiImplicitParams; import com.skyeye.annotation.api.ApiOperation; -import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.personnel.entity.SysEveUserStaff; +import com.skyeye.personnel.entity.SysEveUserStaffQuery; import com.skyeye.personnel.service.SysEveUserStaffService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -39,7 +39,7 @@ public class SysEveUserStaffController { * @param outputObject 出参以及提示信息的返回值对象 */ @ApiOperation(id = "querySysUserStaffList", value = "查看所有员工列表", method = "POST", allUse = "2") - @ApiImplicitParams(classBean = CommonPageInfo.class) + @ApiImplicitParams(classBean = SysEveUserStaffQuery.class) @RequestMapping("/post/SysEveUserStaffController/querySysUserStaffList") public void querySysUserStaffList(InputObject inputObject, OutputObject outputObject) { sysEveUserStaffService.queryPageList(inputObject, outputObject); diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/dao/SysEveUserStaffDao.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/dao/SysEveUserStaffDao.java index f8366e01..8ca0b9c3 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/dao/SysEveUserStaffDao.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/dao/SysEveUserStaffDao.java @@ -21,8 +21,6 @@ import java.util.Map; */ public interface SysEveUserStaffDao extends SkyeyeBaseMapper { - Map querySysUserStaffByIdToDetails(@Param("staffId") String staffId); - int editSysUserStaffState(Map map); List> queryUserMationList(@Param("userIds") String userIds, @Param("staffIds") String staffIds); diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/entity/SysEveUserStaff.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/entity/SysEveUserStaff.java index 644370f7..27f962ae 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/entity/SysEveUserStaff.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/entity/SysEveUserStaff.java @@ -188,7 +188,7 @@ public class SysEveUserStaff extends OperatorUserInfo { private String highestEducation; @TableField("design_wages") - @ApiModelProperty(value = "薪资设定情况 1.待设定2.已设定", required = "num", defaultValue = "1") + @ApiModelProperty(value = "薪资设定情况，参考#StaffWagesStateEnum", required = "num", defaultValue = "1") private Integer designWages; @TableField("act_wages") diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/entity/SysEveUserStaffQuery.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/entity/SysEveUserStaffQuery.java new file mode 100644 index 00000000..f595c75e --- /dev/null +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/entity/SysEveUserStaffQuery.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye + ******************************************************************************/ + +package com.skyeye.personnel.entity; + +import com.skyeye.annotation.api.ApiModel; +import com.skyeye.annotation.api.ApiModelProperty; +import com.skyeye.common.entity.search.CommonPageInfo; +import lombok.Data; + +/** + * @ClassName: SysEveUserStaffQuery + * @Description: 员工查询实体类 + * @author: skyeye云系列--卫志强 + * @date: 2024/8/23 10:37 + * @Copyright: 2024 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. + * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 + */ +@Data +@ApiModel("员工查询实体类") +public class SysEveUserStaffQuery extends CommonPageInfo { + + @ApiModelProperty(value = "薪资设定情况，参考#StaffWagesStateEnum") + private Integer designWages; + +} diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/service/impl/SysEveUserStaffServiceImpl.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/service/impl/SysEveUserStaffServiceImpl.java index 6796a46b..52ad8de1 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/service/impl/SysEveUserStaffServiceImpl.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/personnel/service/impl/SysEveUserStaffServiceImpl.java @@ -13,7 +13,6 @@ import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.common.constans.CommonConstants; import com.skyeye.common.constans.CommonNumConstants; import com.skyeye.common.constans.Constants; -import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.enumeration.UserStaffState; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; @@ -27,9 +26,11 @@ import com.skyeye.organization.service.CompanyDepartmentService; import com.skyeye.organization.service.CompanyJobScoreService; import com.skyeye.organization.service.CompanyJobService; import com.skyeye.organization.service.CompanyMationService; +import com.skyeye.personnel.classenum.StaffWagesStateEnum; import com.skyeye.personnel.classenum.UserLockState; import com.skyeye.personnel.dao.SysEveUserStaffDao; import com.skyeye.personnel.entity.SysEveUserStaff; +import com.skyeye.personnel.entity.SysEveUserStaffQuery; import com.skyeye.personnel.service.SysEveUserService; import com.skyeye.personnel.service.SysEveUserStaffService; import org.springframework.beans.factory.annotation.Autowired; @@ -77,12 +78,11 @@ public class SysEveUserStaffServiceImpl extends SkyeyeBusinessServiceImpl getQueryWrapper(CommonPageInfo commonPageInfo) { - QueryWrapper queryWrapper = super.getQueryWrapper(commonPageInfo); - if (StrUtil.isNotEmpty(commonPageInfo.getType())) { - queryWrapper.eq(MybatisPlusUtil.toColumns(SysEveUserStaff::getType), commonPageInfo.getType()); + public void getQueryWrapper(InputObject inputObject, QueryWrapper wrapper) { + SysEveUserStaffQuery sysEveUserStaffQuery = inputObject.getParams(SysEveUserStaffQuery.class); + if (sysEveUserStaffQuery.getDesignWages() != null) { + wrapper.eq(MybatisPlusUtil.toColumns(SysEveUserStaff::getDesignWages), sysEveUserStaffQuery.getDesignWages()); } - return queryWrapper; } @Override @@ -111,6 +111,7 @@ public class SysEveUserStaffServiceImpl extends SkyeyeBusinessServiceImpl staffMation = sysEveUserStaffDao.querySysUserStaffByIdToDetails(staffId); - String userId = staffMation.get("userId").toString(); - if (!ToolUtil.isBlank(userId)) { - String departmentId = staffMation.get("departmentId").toString(); + SysEveUserStaff staffMation = selectById(staffId); + if (!ToolUtil.isBlank(staffMation.getUserId())) { // 删除redis中缓存的单位下的用户 - jedisClientService.delKeys(Constants.getSysTalkGroupUserListMationById(departmentId) + "*"); + jedisClientService.delKeys(Constants.getSysTalkGroupUserListMationById(staffMation.getDepartmentId()) + "*"); // 锁定帐号 - sysEveUserService.editUserLockState(userId, UserLockState.SYS_USER_LOCK_STATE_ISLOCK.getKey()); + sysEveUserService.editUserLockState(staffMation.getUserId(), UserLockState.SYS_USER_LOCK_STATE_ISLOCK.getKey()); // 退出登录 - sysEveUserService.removeLogin(userId); + sysEveUserService.removeLogin(staffMation.getUserId()); } } @@ -319,12 +318,8 @@ public class SysEveUserStaffServiceImpl extends SkyeyeBusinessServiceImpl bean = sysEveUserStaffDao.querySysUserStaffByIdToDetails(staffId); - companyMationService.setNameMationForMap(bean, "companyId", "companyName", StrUtil.EMPTY); - companyDepartmentService.setNameMationForMap(bean, "departmentId", "departmentName", StrUtil.EMPTY); - companyJobService.setNameMationForMap(bean, "jobId", "jobName", StrUtil.EMPTY); - companyJobScoreService.setNameMationForMap(bean, "jobScoreId", "jobScoreName", StrUtil.EMPTY); - outputObject.setBean(bean); + SysEveUserStaff sysEveUserStaff = selectById(staffId); + outputObject.setBean(sysEveUserStaff); outputObject.settotal(CommonNumConstants.NUM_ONE); } diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/personnel/SysEveUserStaffMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/personnel/SysEveUserStaffMapper.xml index 66d3a1fe..91f504a3 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/personnel/SysEveUserStaffMapper.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/personnel/SysEveUserStaffMapper.xml @@ -2,44 +2,6 @@ - - UPDATE sys_eve_user_staff a