Joshi
05447c21ef
- 修改审批任务服务接口返回类型为Map以支持复杂数据结构 - 新增WMS部门管理模块，包括实体、业务对象、控制器和实现类 - 添加部门树形结构支持和部门负责人管理功能 - 更新审批流程逻辑，集成部门领导审批机制 - 重构审批任务查询方法以关联审批详情和申请人信息 - 添加部门ID字段到请假和外出申请相关实体中 - 优化多级审批流程，支持基于部门层级的审批链路 - 移除废弃的导入语句并整理代码结构
72 lines
1.5 KiB
Java
72 lines
1.5 KiB
Java
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;
|
||
import lombok.Data;
|
||
import org.springframework.format.annotation.DateTimeFormat;
|
||
|
||
import java.util.Date;
|
||
|
||
/**
|
||
* 审批任务视图对象 wms_approval_task
|
||
*
|
||
* @author klp
|
||
* @date 2026-01-20
|
||
*/
|
||
@Data
|
||
@ExcelIgnoreUnannotated
|
||
public class WmsApprovalTaskVo {
|
||
|
||
private Long taskId;
|
||
|
||
/**
|
||
* 审批ID
|
||
*/
|
||
@ExcelProperty(value = "审批ID")
|
||
private Long approvalId;
|
||
|
||
/**
|
||
* 审批人ID
|
||
*/
|
||
@ExcelProperty(value = "审批人ID")
|
||
private Long approverId;
|
||
|
||
/**
|
||
* 审批人姓名
|
||
*/
|
||
@ExcelProperty(value = "审批人姓名")
|
||
private String approverName;
|
||
|
||
/**
|
||
* 任务状态（pending=待审批，approved=已通过，rejected=已驳回）
|
||
*/
|
||
@ExcelProperty(value = "任务状态", converter = ExcelDictConvert.class)
|
||
private String taskStatus;
|
||
|
||
/**
|
||
* 审批意见
|
||
*/
|
||
@ExcelProperty(value = "审批意见")
|
||
private String approvalOpinion;
|
||
|
||
/**
|
||
* 审批时间
|
||
*/
|
||
@ExcelProperty(value = "审批时间")
|
||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||
private Date approvalTime;
|
||
|
||
private String remark;
|
||
|
||
private Date createTime;
|
||
|
||
private String createBy;
|
||
|
||
private Date updateTime;
|
||
|
||
private String updateBy;
|
||
}
|