feat(wms): 增加多级审批功能和审批任务管理
- 在WmsApproval实体类中增加审批类型、需要审批人数、已审批人数、最终状态字段 - 实现审批任务通过和驳回功能,支持单人和多级审批流程 - 创建WmsApprovalTask相关实体类、业务对象、数据访问层和控制器 - 集成部门领导查询机制,实现多级审批链路构建 - 更新审批控制器,添加审批任务相关的API接口 - 优化审批列表查询,集成审批任务信息展示 - 配置MyBatis映射文件,支持新的审批任务数据表结构
This commit is contained in:
@@ -44,6 +44,26 @@ public class WmsApprovalBo extends BaseEntity {
|
||||
*/
|
||||
private String approvalStatus;
|
||||
|
||||
/**
|
||||
* 审批类型(single=单人审批,multi=多级审批)
|
||||
*/
|
||||
private String approvalType;
|
||||
|
||||
/**
|
||||
* 需要审批的人数
|
||||
*/
|
||||
private Integer requiredApprovers;
|
||||
|
||||
/**
|
||||
* 已审批的人数
|
||||
*/
|
||||
private Integer currentApprovers;
|
||||
|
||||
/**
|
||||
* 最终状态(pending=审批中,all_approved=全部通过,rejected=已驳回)
|
||||
*/
|
||||
private String finalStatus;
|
||||
|
||||
/**
|
||||
* 审批意见
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 审批任务业务对象 wms_approval_task
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-01-20
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsApprovalTaskBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 任务ID
|
||||
*/
|
||||
private Long taskId;
|
||||
|
||||
/**
|
||||
* 审批ID
|
||||
*/
|
||||
private Long approvalId;
|
||||
|
||||
/**
|
||||
* 审批人ID
|
||||
*/
|
||||
private Long approverId;
|
||||
|
||||
/**
|
||||
* 审批人姓名
|
||||
*/
|
||||
private String approverName;
|
||||
|
||||
/**
|
||||
* 任务状态
|
||||
*/
|
||||
private String taskStatus;
|
||||
|
||||
/**
|
||||
* 审批意见
|
||||
*/
|
||||
private String approvalOpinion;
|
||||
|
||||
/**
|
||||
* 审批时间
|
||||
*/
|
||||
private Date approvalTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
}
|
||||
Reference in New Issue
Block a user