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-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java |   84 ++++++++++++++++++++++++++++++-----------
 1 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
index 8e07728..a1284a4 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
@@ -1,17 +1,19 @@
 package org.jeecg.modules.mdc.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.entity.JeecgEntity;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description: 璁惧鍔犵彮绠＄悊
@@ -28,33 +30,69 @@
 
     private static final long serialVersionUID = -7163039765166584824L;
 
-    /**
-     * 璁惧缂栫爜
-     */
-    @Excel(name = "璁惧缂栫爜", width = 15)
-    @ApiModelProperty(value = "璁惧缂栫爜")
+    @Excel(name = "璁惧缂栧彿", width = 20)
+    @ApiModelProperty("璁惧缂栧彿")
     private String equipmentId;
+
+    @TableField(exist = false)
+    @Excel(name = "璁惧鍚嶇О", width = 20)
+    @ApiModelProperty("璁惧鍚嶇О")
+    private String equipmentName;
+
+    @ApiModelProperty("鏃ユ湡")
+    @Excel(name = "鏃ユ湡", width = 20)
+    private String theDate;
+
+//    @Excel(name = "鑷姩璁＄畻鏍囪瘑", width = 15)
+    @ApiModelProperty("鑷姩璁＄畻鏍囪瘑")
+    private Integer autoFlag = CommonConstant.AUTO_FLAG_N;
+
     /**
-     * 鐢熸晥鏃ユ湡
+     * 鍔犵彮寮�濮嬫椂闂�
      */
-    @Excel(name = "鐢熸晥鏃ユ湡", width = 15)
-    @ApiModelProperty(value = "鐢熸晥鏃ユ湡")
-    private String effectiveDate;
+    @Excel(name = "鍔犵彮寮�濮嬫椂闂�", width = 20)
+    @ApiModelProperty(value = "鍔犵彮寮�濮嬫椂闂�")
+    private String startTime;
     /**
-     * 寮�濮嬫椂闂�
+     * 鍔犵彮缁撴潫鏃堕棿
      */
-    @Excel(name = "寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "寮�濮嬫椂闂�")
-    private java.util.Date startTime;
+    @Excel(name = "鍔犵彮缁撴潫鏃堕棿", width = 20)
+    @ApiModelProperty(value = "鍔犵彮缁撴潫鏃堕棿")
+    private String endTime;
+
     /**
-     * 缁撴潫鏃堕棿
+     * 鍔犵彮鏃堕暱
      */
-    @Excel(name = "缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "缁撴潫鏃堕棿")
-    private java.util.Date endTime;
+    @Excel(name = "鏃堕暱", width = 20)
+    @ApiModelProperty(value = "鏃堕暱")
+    private BigDecimal duration;
+
+    /**
+     * 澶囨敞
+     */
+    @Excel(name = "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+
+    /**
+     * 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id
+     */
+    @TableField(exist = false)
+    private String parentId;
+
+    /**
+     * 鍓嶅彴浼犲叆 杞﹂棿灞傜骇:1 閮ㄩ棬灞傜骇:2
+     */
+    @TableField(exist = false)
+    private String typeTree;
+
+    /**
+     * 閮ㄩ棬parentId 鍏宠仈瀛愰泦id
+     */
+    @TableField(exist = false)
+    private List<String> mdcSectionIds;
+
+    @TableField(exist = false)
+    private String equipmentIds;
 
 }

--
Gitblit v1.9.3