- 修改IWmsApprovalService接口方法返回类型为Map<String, Object> - 更新WmsApprovalController控制器响应类型以匹配服务层变更 - 在WmsApprovalServiceImpl中实现审批详情查询和创建人昵称转换功能 - 添加批量查询用户昵称优化性能 - 实现请假和外出申请的审批状态管理 - 扩展WmsLeaveRequestVo和WmsOutRequestVo添加创建人姓名字段 - 在请假和外出申请创建时自动生成对应的审批记录
99 lines
2.2 KiB
Java
99 lines
2.2 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;
|
|
|
|
|
|
}
|