From c27f9b76d656bb34293eda0b2b81936d3b3b453a Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Mon, 22 Apr 2024 14:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E6=9C=BA=E5=92=8C?=
 =?UTF-8?q?=E5=81=9C=E6=9C=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/CreateCoalWashingDailyAnalysisDto.java        | 10 ++++++++++
 .../dto/UpdateCoalWashingDailyAnalysisDto.java        | 10 ++++++++++
 .../entity/CoalWashingDailyAnalysisEntity.java        | 11 +++++++++++
 3 files changed, 31 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java
index 4b5b0b7d..844d2816 100644
--- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java
+++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java
@@ -15,6 +15,7 @@ import lombok.Data;
 import org.hibernate.annotations.Comment;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /** */
@@ -25,6 +26,15 @@ public class CreateCoalWashingDailyAnalysisDto extends OrgCommonDto {
     @Comment("日期")
     private LocalDate date;
 
+    @Comment("开机时间")
+    private LocalDateTime startTime;
+
+    @Comment("停机时间")
+    private LocalDateTime endTime;
+
+    @Comment("皮带秤设备组")
+    private String pdcDeviceGroup;
+
     @ElementCollection
     @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private List<CoalWashingDailyAnalysisItemVo> inputItems;
diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java
index e617cc2c..021ff144 100644
--- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java
+++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java
@@ -15,6 +15,7 @@ import lombok.Data;
 import org.hibernate.annotations.Comment;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /** */
@@ -25,6 +26,15 @@ public class UpdateCoalWashingDailyAnalysisDto extends OrgCommonDto {
     @Comment("日期")
     private LocalDate date;
 
+    @Comment("开机时间")
+    private LocalDateTime startTime;
+
+    @Comment("停机时间")
+    private LocalDateTime endTime;
+
+    @Comment("皮带秤设备组")
+    private String pdcDeviceGroup;
+
     @ElementCollection
     @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private List<CoalWashingDailyAnalysisItemVo> inputItems;
diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java
index 2d391da2..80d95f35 100644
--- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java
+++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java
@@ -17,6 +17,7 @@ import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Comparator;
 import java.util.List;
@@ -35,6 +36,16 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
     @Comment("日期")
     private LocalDate date;
 
+
+    @Comment("开机时间")
+    private LocalDateTime startTime;
+
+    @Comment("停机时间")
+    private LocalDateTime endTime;
+
+    @Comment("皮带秤设备组")
+    private String pdcDeviceGroup;
+
     @ElementCollection()
     @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     @Fetch(FetchMode.SUBSELECT)