代码提交 公章管理

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<Void> changeStatus(@RequestBody LxMaterialSealBo sealBo) {
-        return toAjax(lxMaterialSealService.updateRoleStatus(sealBo.getId(), sealBo.getSealStatus()));
+        return toAjax(lxMaterialSealService.updateSealStatus(sealBo.getId(), sealBo.getSealStatus()));
     }
 }

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;
 
     /**
      * 删除标志

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;
 
 
 }

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;
 
 
 }

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);
 }

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) {
+    public Integer updateSealStatus(Long id, String sealStatus) {
-        return null;
+        LxMaterialSeal seal = new LxMaterialSeal();
+        seal.setId(id);
+        seal.setSealStatus(sealStatus);
+        return baseMapper.updateById(seal);
     }
 }

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;

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;
+
     /**
      * 排除不查询的用户(工作流用)
      */

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;
+
 }

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 -> {

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.SysUserMapper">
 
     <resultMap type="org.dromara.system.domain.vo.SysUserVo" id="SysUserResult">
@@ -17,7 +17,8 @@
             ${ew.getSqlSelect}
         </if>
         <if test="ew.getSqlSelect == null">
-            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
         </if>
         from sys_user u
@@ -38,35 +39,67 @@
     </select>
 
     <select id="selectUserExportList" resultMap="SysUserExportResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
+        select u.user_id,
-            u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+               u.dept_id,
-            d.dept_name, d.leader, u1.user_name as leaderName
+               u.nick_name,
+               u.user_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.sex,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_name,
+               d.leader,
+               u1.user_name as leaderName
         from sys_user u
-            left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_dept d on u.dept_id = d.dept_id
-            left join sys_user u1 on u1.user_id = d.leader
+                 left join sys_user u1 on u1.user_id = d.leader
-        ${ew.getCustomSqlSegment}
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectAllocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id,
+                        u.dept_id,
+                        u.user_name,
+                        u.nick_name,
+                        u.email,
+                        u.phonenumber,
+                        u.status,
+                        u.create_time
         from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
+                 left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="selectUnallocatedList" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id,
+                        u.dept_id,
+                        u.user_name,
+                        u.nick_name,
+                        u.email,
+                        u.phonenumber,
+                        u.status,
+                        u.create_time
         from sys_user u
-             left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_dept d on u.dept_id = d.dept_id
-             left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
-             left join sys_role r on r.role_id = sur.role_id
+                 left join sys_role r on r.role_id = sur.role_id
-        ${ew.getCustomSqlSegment}
+            ${ew.getCustomSqlSegment}
     </select>
 
     <select id="countUserById" resultType="Long">
-        select count(*) from sys_user where del_flag = '0' and user_id = #{userId}
+        select count(*)
+        from sys_user
+        where del_flag = '0'
+          and user_id = #{userId}
     </select>