From ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:32:36 +0800
Subject: [PATCH] 添加产品汇总报表

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
index a9cd2c5..4c23cad 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/DeviceMaintenance.java
@@ -1,36 +1,65 @@
 package com.example.erp.entity.pp;
 
-import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
 public class DeviceMaintenance {
+
     //鑷id
     private Integer id;
     //璁惧缂栧彿
     private String deviceId;
+    //璁惧鍚嶇О
+    private String deviceName;
     //绫诲瀷
-    private Integer type;
+    private String type;
     //鏁呴殰鏃ユ湡
-    private LocalDate faultTime;
-    //鏁呴殰鍘熷洜
-    private String faultReason;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime faultTime;
     //淇濆吇鏃ユ湡
-    private LocalDate maintenanceTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime maintenanceTime;
     //淇濆吇璇存槑
     private String maintenanceIllustrate;
     //缁翠慨/淇濆吇寮�濮嬫椂闂�
-    private LocalDate startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime startTime;
     //缁翠慨/淇濆吇缁撴潫鏃堕棿
-    private LocalDate stopTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime stopTime;
+    //鎵�鍦ㄥ伐搴�
+    private String process;
     //缁翠慨/淇濆吇浜哄憳
     private String personnel;
     //璐圭敤
     private String cost;
     //鍒涘缓鏃堕棿
-    private LocalDate createTime;
+    private LocalDateTime createTime;
     //淇敼鏃堕棿
-    private LocalDate updateTime;
+    private LocalDateTime updateTime;
+    //鏁呴殰鍘熷洜
+    private String faultReason;
 
     //澶栭敭璁惧琛�
     private Device  device;
 
+    @TableField(select = false,exist= false)
+    private String faultCount;
+    @TableField(select = false,exist= false)
+    private String maintenanceCount;
+    @TableField(select = false,exist= false)
+    private String faultLastTime;
+    @TableField(select = false,exist= false)
+    private String maintenanceLastTime;
+    @TableField(select = false,exist= false)
+    private String faultCost;
+    @TableField(select = false,exist= false)
+    private String maintenanceCost;
+
+
 }

--
Gitblit v1.8.0