From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java | 63 ++++++++++++++-----------------
1 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java
index 417d176..cae15a3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PlanChangeApply.java
@@ -4,12 +4,13 @@
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.system.base.entity.JeecgEntity;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -29,13 +30,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_plan_change_apply瀵硅薄", description="mom_eam_plan_change_apply")
-public class PlanChangeApply implements Serializable {
+public class PlanChangeApply extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**id*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "id")
- private String id;
/**applyUnit*/
@Excel(name = "applyUnit", width = 15)
@ApiModelProperty(value = "applyUnit")
@@ -55,15 +52,15 @@
@ApiModelProperty(value = "maintenanceOrderId")
private String maintenanceOrderId;
/**planStartTime*/
- @Excel(name = "planStartTime", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @Excel(name = "planStartTime", width = 15, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "planStartTime")
private Date planStartTime;
/**planDelayTime*/
- @Excel(name = "planDelayTime", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @Excel(name = "planDelayTime", width = 15, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "planDelayTime")
private Date planDelayTime;
/**planUser*/
@@ -75,29 +72,22 @@
@ApiModelProperty(value = "delayReason")
private String delayReason;
/**annex*/
- @Excel(name = "annex", width = 15)
- @ApiModelProperty(value = "annex")
- private String annex;
+ @Excel(name = "闄勪欢鍚嶇О", width = 15)
+ @ApiModelProperty(value = "闄勪欢鍚嶇О")
+ private String annexName;
+
+ @Excel(name = "闄勪欢澶у皬", width = 15)
+ @ApiModelProperty(value = "闄勪欢澶у皬")
+ private String annexSize;
+
+ @Excel(name = "璺緞", width = 15)
+ @ApiModelProperty(value = "璺緞")
+ private String annexPath;
/**remark*/
@Excel(name = "remark", width = 15)
@ApiModelProperty(value = "remark")
private String remark;
- /**createBy*/
- @ApiModelProperty(value = "createBy")
- private String createBy;
- /**createTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "createTime")
- private Date createTime;
- /**updateBy*/
- @ApiModelProperty(value = "updateBy")
- private String updateBy;
- /**updateTime*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "updateTime")
- private Date updateTime;
+
/**tenantId*/
@Excel(name = "tenantId", width = 15)
@ApiModelProperty(value = "tenantId")
@@ -106,5 +96,8 @@
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
@TableLogic
- private Integer delFlag;
+ private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ @TableField(exist = false)
+ private String planId;
+
}
--
Gitblit v1.9.3