feat(approval): 完善审批流程并新增部门管理功能
- 修改审批任务服务接口返回类型为Map以支持复杂数据结构 - 新增WMS部门管理模块,包括实体、业务对象、控制器和实现类 - 添加部门树形结构支持和部门负责人管理功能 - 更新审批流程逻辑,集成部门领导审批机制 - 重构审批任务查询方法以关联审批详情和申请人信息 - 添加部门ID字段到请假和外出申请相关实体中 - 优化多级审批流程,支持基于部门层级的审批链路 - 移除废弃的导入语句并整理代码结构
This commit is contained in:
53
klp-wms/src/main/java/com/klp/domain/WmsDept.java
Normal file
53
klp-wms/src/main/java/com/klp/domain/WmsDept.java
Normal file
@@ -0,0 +1,53 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import com.klp.common.core.domain.TreeEntity;
|
||||
|
||||
/**
|
||||
* WMS系统部门(树形结构)对象 wms_dept
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-03-02
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_dept")
|
||||
public class WmsDept extends TreeEntity<WmsDept> {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@TableId(value = "dept_id")
|
||||
private Long deptId;
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
private String deptName;
|
||||
/**
|
||||
* 部门显示顺序(同级排序)
|
||||
*/
|
||||
private Long orderNum;
|
||||
/**
|
||||
* 部门负责人
|
||||
*/
|
||||
private Long leader;
|
||||
/**
|
||||
* 部门状态(0正常 1停用)
|
||||
*/
|
||||
private String status;
|
||||
/**
|
||||
* 删除标志(0=正常,1=已删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -79,5 +79,8 @@ public class WmsApprovalBo extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
//部门id
|
||||
private Long deptId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
51
klp-wms/src/main/java/com/klp/domain/bo/WmsDeptBo.java
Normal file
51
klp-wms/src/main/java/com/klp/domain/bo/WmsDeptBo.java
Normal file
@@ -0,0 +1,51 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import com.klp.common.core.domain.TreeEntity;
|
||||
|
||||
/**
|
||||
* WMS系统部门(树形结构)业务对象 wms_dept
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-03-02
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsDeptBo extends TreeEntity<WmsDeptBo> {
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
private String deptName;
|
||||
|
||||
/**
|
||||
* 部门显示顺序(同级排序)
|
||||
*/
|
||||
private Long orderNum;
|
||||
|
||||
/**
|
||||
* 部门负责人
|
||||
*/
|
||||
private Long leader;
|
||||
|
||||
/**
|
||||
* 部门状态(0正常 1停用)
|
||||
*/
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -96,5 +96,8 @@ public class WmsLeaveRequestBo extends BaseEntity {
|
||||
// 审批类型
|
||||
private String approvalType;
|
||||
|
||||
// 部门id
|
||||
private Long deptId;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -78,4 +78,9 @@ public class WmsOutRequestBo extends BaseEntity {
|
||||
// 审批人
|
||||
private String approverName;
|
||||
|
||||
private String approvalType;
|
||||
|
||||
// 部门id
|
||||
private Long deptId;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
@@ -15,6 +16,7 @@ import java.util.Date;
|
||||
* @date 2026-01-20
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsApprovalTaskVo {
|
||||
|
||||
private Long taskId;
|
||||
|
||||
68
klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java
Normal file
68
klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java
Normal file
@@ -0,0 +1,68 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* WMS系统部门(树形结构)视图对象 wms_dept
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-03-02
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsDeptVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ExcelProperty(value = "部门id")
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 父部门id(0表示顶级部门)
|
||||
*/
|
||||
@ExcelProperty(value = "父部门id", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "0=表示顶级部门")
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
@ExcelProperty(value = "部门名称")
|
||||
private String deptName;
|
||||
|
||||
/**
|
||||
* 部门显示顺序(同级排序)
|
||||
*/
|
||||
@ExcelProperty(value = "部门显示顺序", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "同=级排序")
|
||||
private Long orderNum;
|
||||
|
||||
/**
|
||||
* 部门负责人
|
||||
*/
|
||||
@ExcelProperty(value = "部门负责人")
|
||||
private Long leader;
|
||||
|
||||
/**
|
||||
* 部门状态(0正常 1停用)
|
||||
*/
|
||||
@ExcelProperty(value = "部门状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "0=正常,1=停用")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user