admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交 公章管理

Browse Source
This commit is contained in:
123 2025-05-13 17:34:24 +08:00
parent 4a857c2134
commit d621968212
11 changed files with 116 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/controller/LxMaterialSealController.java
View File

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

2
ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/LxMaterialSeal.java
View File

@ -47,7 +47,7 @@ public class LxMaterialSeal extends BaseEntity {
/**
* 启用状态
*/
private Long sealStatus;
private String sealStatus;
/**
* 删除标志

4
ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/bo/LxMaterialSealBo.java
View File

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

4
ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/domain/vo/LxMaterialSealVo.java
View File

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

2
ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/ILxMaterialSealService.java
View File

@ -73,5 +73,5 @@ public interface ILxMaterialSealService {
* @param sealStatus 公章状态
* @return 结果
*/
Integer updateRoleStatus(Long id, Long sealStatus);
Integer updateSealStatus(Long id, String sealStatus);
}

7
ruoyi-modules/ruoyi-lx/src/main/java/org/dromara/lx/operate/service/impl/LxMaterialSealServiceImpl.java
View File

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

21
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
View File

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

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
View File

@ -108,6 +108,11 @@ public class SysUserBo extends BaseEntity {
*/
private String userIds;
/**
* 员工姓名
*/
private String employeeName;
/**
* 排除不查询的用户(工作流用)
*/

25
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
View File

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

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
View File

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

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

@ -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,9 +39,24 @@
</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,
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
select u.user_id,
u.dept_id,
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_user u1 on u1.user_id = d.leader
@ -48,7 +64,14 @@
</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_user_role sur on u.user_id = sur.user_id
@ -57,7 +80,14 @@
</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_user_role sur on u.user_id = sur.user_id
@ -66,7 +96,10 @@
</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>