|
|
|
|
@ -1,18 +1,15 @@
|
|
|
|
|
package org.dromara.oa.erp.domain.vo;
|
|
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
|
|
import org.dromara.oa.erp.domain.ErpProjectAcceptance;
|
|
|
|
|
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
|
|
|
|
|
import cn.idev.excel.annotation.ExcelProperty;
|
|
|
|
|
import org.dromara.common.excel.annotation.ExcelDictFormat;
|
|
|
|
|
import org.dromara.common.excel.convert.ExcelDictConvert;
|
|
|
|
|
import cn.idev.excel.annotation.format.DateTimeFormat;
|
|
|
|
|
import io.github.linpeilie.annotations.AutoMapper;
|
|
|
|
|
import lombok.Data;
|
|
|
|
|
|
|
|
|
|
import java.io.Serial;
|
|
|
|
|
import java.io.Serializable;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -33,13 +30,11 @@ public class ErpProjectAcceptanceVo implements Serializable {
|
|
|
|
|
/**
|
|
|
|
|
* 验收确认ID
|
|
|
|
|
*/
|
|
|
|
|
@ExcelProperty(value = "验收确认ID")
|
|
|
|
|
private Long acceptanceId;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 项目ID
|
|
|
|
|
*/
|
|
|
|
|
@ExcelProperty(value = "项目ID")
|
|
|
|
|
private Long projectId;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -63,7 +58,6 @@ public class ErpProjectAcceptanceVo implements Serializable {
|
|
|
|
|
/**
|
|
|
|
|
* 项目经理
|
|
|
|
|
*/
|
|
|
|
|
@ExcelProperty(value = "项目经理")
|
|
|
|
|
private Long managerId;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -75,6 +69,7 @@ public class ErpProjectAcceptanceVo implements Serializable {
|
|
|
|
|
/**
|
|
|
|
|
* 验收日期
|
|
|
|
|
*/
|
|
|
|
|
@DateTimeFormat("yyyy-MM-dd")
|
|
|
|
|
@ExcelProperty(value = "验收日期")
|
|
|
|
|
private Date acceptanceDate;
|
|
|
|
|
|
|
|
|
|
@ -87,13 +82,11 @@ public class ErpProjectAcceptanceVo implements Serializable {
|
|
|
|
|
/**
|
|
|
|
|
* 部门负责人
|
|
|
|
|
*/
|
|
|
|
|
@ExcelProperty(value = "部门负责人")
|
|
|
|
|
private Long chargeId;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 分管副总
|
|
|
|
|
*/
|
|
|
|
|
@ExcelProperty(value = "分管副总")
|
|
|
|
|
private Long deputyId;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -117,13 +110,11 @@ public class ErpProjectAcceptanceVo implements Serializable {
|
|
|
|
|
/**
|
|
|
|
|
* 项目状态(1暂存 2审批中 3可用)
|
|
|
|
|
*/
|
|
|
|
|
@ExcelProperty(value = "项目状态")
|
|
|
|
|
private String acceptanceStatus;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 流程状态
|
|
|
|
|
*/
|
|
|
|
|
@ExcelProperty(value = "流程状态")
|
|
|
|
|
private String flowStatus;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|