From eadaad85fc5fed59c34a0145c2f99a1022581458 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期二, 21 十一月 2023 20:57:25 +0800
Subject: [PATCH] 生产时间间隔报表逻辑、设备完好率报表逻辑

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java |   67 +++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 21 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 5876e4e..bf2d75d 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
@@ -2,7 +2,6 @@
 
 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;
@@ -10,10 +9,8 @@
 import lombok.experimental.Accessors;
 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.util.Date;
 import java.util.List;
 
 /**
@@ -31,34 +28,62 @@
 
     private static final long serialVersionUID = -7163039765166584824L;
 
-    /**
-     * 璁惧缂栫爜
-     */
-    @Excel(name = "璁惧缂栫爜", width = 15)
-    @ApiModelProperty(value = "璁惧缂栫爜")
+    @TableField(exist = false)
+    @Excel(name = "璁惧缂栧彿", width = 20)
     private String equipmentId;
+
+    @TableField(exist = false)
+    @Excel(name = "璁惧鍚嶇О", width = 20)
+    private String equipmentName;
+
     /**
      * 鐢熸晥鏃ユ湡
      */
     @Excel(name = "鐢熸晥鏃ユ湡", width = 15)
-    @ApiModelProperty(value = "鐢熸晥鏃ユ湡")
+    @TableField(exist = false)
     private String effectiveDate;
+
     /**
-     * 寮�濮嬫椂闂�
+     * 鐝寮�濮嬫椂闂�
      */
-    @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 Date startTime;
+    @Excel(name = "鐝寮�濮嬫椂闂�", width = 20)
+    @ApiModelProperty("鐝寮�濮嬫椂闂�")
+    @TableField(exist = false)
+    private String startDate;
+
     /**
-     * 缁撴潫鏃堕棿
+     * 鐝缁撴潫鏃堕棿
      */
-    @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 Date endTime;
+    @Excel(name = "鐝缁撴潫鏃堕棿", width = 20)
+    @ApiModelProperty("鐝缁撴潫鏃堕棿")
+    @TableField(exist = false)
+    private String endDate;
+
+    /**
+     * 宸ヤ綔鏃ュ巻id
+     */
+    @ApiModelProperty(value = "宸ヤ綔鏃ュ巻id")
+    private String calendarId;
+
+    /**
+     * 鍔犵彮寮�濮嬫椂闂�
+     */
+    @Excel(name = "鍔犵彮寮�濮嬫椂闂�", width = 20)
+    @ApiModelProperty(value = "鍔犵彮寮�濮嬫椂闂�")
+    private String startTime;
+    /**
+     * 鍔犵彮缁撴潫鏃堕棿
+     */
+    @Excel(name = "鍔犵彮缁撴潫鏃堕棿", width = 20)
+    @ApiModelProperty(value = "鍔犵彮缁撴潫鏃堕棿")
+    private String endTime;
+
+    /**
+     * 澶囨敞
+     */
+    @Excel(name = "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
 
     /**
      * 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id

--
Gitblit v1.9.3