Joshi
ffecaf9a5a
- 在WmsLeaveRequestVo和WmsOutRequestVo中新增审批状态、审批类型和审批人姓名字段 - 在WmsLeaveRequestServiceImpl的查询方法中集成审批信息获取逻辑 - 在WmsOutRequestServiceImpl的查询方法中集成审批信息获取逻辑 - 通过审批服务查询并填充每条记录的审批相关信息 - 实现了统一的审批信息展示功能，提升用户体验
113 lines
2.5 KiB
Java
113 lines
2.5 KiB
Java
package com.klp.domain.vo;
|
||
|
||
import java.math.BigDecimal;
|
||
import java.util.Date;
|
||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||
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 com.klp.common.core.domain.BaseEntity;
|
||
import lombok.Data;
|
||
|
||
|
||
/**
|
||
* 员工外出申请视图对象 wms_out_request
|
||
*
|
||
* @author klp
|
||
* @date 2026-01-20
|
||
*/
|
||
@Data
|
||
@ExcelIgnoreUnannotated
|
||
public class WmsOutRequestVo extends BaseEntity {
|
||
|
||
private static final long serialVersionUID = 1L;
|
||
|
||
/**
|
||
* 主键ID
|
||
*/
|
||
@ExcelProperty(value = "主键ID")
|
||
private Long outId;
|
||
|
||
/**
|
||
* 外出类型（办公/办事/访客/其他）
|
||
*/
|
||
@ExcelProperty(value = "外出类型", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "办=公/办事/访客/其他")
|
||
private String outType;
|
||
|
||
/**
|
||
* 外出人姓名
|
||
*/
|
||
@ExcelProperty(value = "外出人姓名")
|
||
private String applicantName;
|
||
|
||
/**
|
||
* 外出人部门名称
|
||
*/
|
||
@ExcelProperty(value = "外出人部门名称")
|
||
private String applicantDeptName;
|
||
|
||
/**
|
||
* 外出开始时间
|
||
*/
|
||
@ExcelProperty(value = "外出开始时间")
|
||
private Date startTime;
|
||
|
||
/**
|
||
* 外出结束时间
|
||
*/
|
||
@ExcelProperty(value = "外出结束时间")
|
||
private Date endTime;
|
||
|
||
/**
|
||
* 外出时长（小时）
|
||
*/
|
||
@ExcelProperty(value = "外出时长", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "小=时")
|
||
private BigDecimal outHours;
|
||
|
||
/**
|
||
* 外出地点
|
||
*/
|
||
@ExcelProperty(value = "外出地点")
|
||
private String outPlace;
|
||
|
||
/**
|
||
* 外出原因
|
||
*/
|
||
@ExcelProperty(value = "外出原因")
|
||
private String outReason;
|
||
|
||
/**
|
||
* 附件（相关证明等）
|
||
*/
|
||
@ExcelProperty(value = "附件", converter = ExcelDictConvert.class)
|
||
@ExcelDictFormat(readConverterExp = "相=关证明等")
|
||
private String attachmentUrls;
|
||
|
||
/**
|
||
* 备注
|
||
*/
|
||
@ExcelProperty(value = "备注")
|
||
private String remark;
|
||
|
||
private String createByName;
|
||
|
||
/**
|
||
* 审批状态（待审批/已同意/已驳回/已撤销）
|
||
*/
|
||
private String approvalStatus;
|
||
|
||
/**
|
||
* 审批类型（single=单人审批，multi=多级审批）
|
||
*/
|
||
private String approvalType;
|
||
|
||
/**
|
||
* 审批人姓名
|
||
*/
|
||
private String approverName;
|
||
|
||
}
|