From d621968212d371600c81b92a65372dbcb7f0b299 Mon Sep 17 00:00:00 2001 From: 123 <123@qq.com> Date: Tue, 13 May 2025 17:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=AC=E7=AB=A0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LxMaterialSealController.java | 4 +- .../lx/operate/domain/LxMaterialSeal.java | 2 +- .../operate/domain/bo/LxMaterialSealBo.java | 4 +- .../operate/domain/vo/LxMaterialSealVo.java | 4 +- .../service/ILxMaterialSealService.java | 2 +- .../impl/LxMaterialSealServiceImpl.java | 7 +- .../org/dromara/system/domain/SysUser.java | 21 ++++++ .../dromara/system/domain/bo/SysUserBo.java | 5 ++ .../dromara/system/domain/vo/SysUserVo.java | 25 ++++++- .../service/impl/SysUserServiceImpl.java | 1 + .../resources/mapper/system/SysUserMapper.xml | 73 ++++++++++++++----- 11 files changed, 116 insertions(+), 32 deletions(-) diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/controller/LxMaterialSealController.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/controller/LxMaterialSealController.java index d0f4083d7..d3ce8e06e 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/controller/LxMaterialSealController.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/controller/LxMaterialSealController.java @@ -108,9 +108,9 @@ public class LxMaterialSealController extends BaseController { * 状态修改 */ @SaCheckPermission("operate:materialSeal:edit") - @Log(title = "公章管理", businessType = BusinessType.UPDATE) + @Log(title = "公章管理-状态修改", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody LxMaterialSealBo sealBo) { - return toAjax(lxMaterialSealService.updateRoleStatus(sealBo.getId(), sealBo.getSealStatus())); + return toAjax(lxMaterialSealService.updateSealStatus(sealBo.getId(), sealBo.getSealStatus())); } } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java index 04a377082..13b508617 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java @@ -47,7 +47,7 @@ public class LxMaterialSeal extends BaseEntity { /** * 启用状态 */ - private Long sealStatus; + private String sealStatus; /** * 删除标志 diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/bo/LxMaterialSealBo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/bo/LxMaterialSealBo.java index 72843417e..4da66ed3b 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/bo/LxMaterialSealBo.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/bo/LxMaterialSealBo.java @@ -28,7 +28,7 @@ public class LxMaterialSealBo extends BaseEntity { /** * 公章类型 */ - private Long sealType; + private String sealType; /** * 公章名称 @@ -43,7 +43,7 @@ public class LxMaterialSealBo extends BaseEntity { /** * 启用状态 */ - private Long sealStatus; + private String sealStatus; } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java index a832807b3..9f7e4a41c 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java @@ -34,7 +34,7 @@ public class LxMaterialSealVo implements Serializable { * 印章类型 */ @ExcelProperty(value = "印章类型") - private Long sealType; + private String sealType; /** * 印章名称 @@ -52,7 +52,7 @@ public class LxMaterialSealVo implements Serializable { * 启用状态 */ @ExcelProperty(value = "启用状态") - private Long sealStatus; + private String sealStatus; } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/ILxMaterialSealService.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/ILxMaterialSealService.java index 344878c84..1169a135d 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/ILxMaterialSealService.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/ILxMaterialSealService.java @@ -73,5 +73,5 @@ public interface ILxMaterialSealService { * @param sealStatus 公章状态 * @return 结果 */ - Integer updateRoleStatus(Long id, Long sealStatus); + Integer updateSealStatus(Long id, String sealStatus); } diff --git a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java index 9f829e9cc..5991ca351 100644 --- a/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java +++ b/ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java @@ -132,7 +132,10 @@ public class LxMaterialSealServiceImpl implements ILxMaterialSealService { } @Override - public Integer updateRoleStatus(Long id, Long sealStatus) { - return null; + public Integer updateSealStatus(Long id, String sealStatus) { + LxMaterialSeal seal = new LxMaterialSeal(); + seal.setId(id); + seal.setSealStatus(sealStatus); + return baseMapper.updateById(seal); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java index 3712f805f..93a78c575 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.tenant.core.TenantEntity; +import java.time.LocalDate; import java.util.Date; /** @@ -103,6 +104,26 @@ public class SysUser extends TenantEntity { */ private String remark; + /** + * 员工姓名 + */ + private String employeeName; + + /** + * 用工状态 + */ + private String employeeStatus; + + /** + * 入职时间 + */ + private LocalDate employeeHireDate; + + /** + * 离职时间 + */ + private LocalDate employeeLeaveDate; + public SysUser(Long userId) { this.userId = userId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java index 1472d2428..a57769345 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java @@ -108,6 +108,11 @@ public class SysUserBo extends BaseEntity { */ private String userIds; + /** + * 员工姓名 + */ + private String employeeName; + /** * 排除不查询的用户(工作流用) */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 86249d20e..1a561b43f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -2,16 +2,17 @@ package org.dromara.system.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; import org.dromara.common.sensitive.annotation.Sensitive; import org.dromara.common.sensitive.core.SensitiveStrategy; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.system.domain.SysUser; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -139,4 +140,24 @@ public class SysUserVo implements Serializable { */ private Long roleId; + /** + * 员工姓名 + */ + private String employeeName; + + /** + * 用工状态 + */ + private String employeeStatus; + + /** + * 入职时间 + */ + private LocalDate employeeHireDate; + + /** + * 离职时间 + */ + private LocalDate employeeLeaveDate; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index cecd7f56f..d5b263b40 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -83,6 +83,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) + .like(StringUtils.isNotBlank(user.getEmployeeName()), "u.employee_name", user.getEmployeeName()) .between(params.get("beginTime") != null && params.get("endTime") != null, "u.create_time", params.get("beginTime"), params.get("endTime")) .and(ObjectUtil.isNotNull(user.getDeptId()), w -> { diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index ded6fa858..5cb592d7d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> @@ -17,7 +17,8 @@ ${ew.getSqlSelect} - u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, + u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.employee_name, + u.employee_hire_date, u.employee_leave_date, u.employee_status, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark from sys_user u @@ -38,35 +39,67 @@