From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java |   98 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 98 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java
new file mode 100644
index 0000000..8a8e685
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java
@@ -0,0 +1,98 @@
+package com.mes.largenscreen.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.mes.utils.excel.ExcelMerge;
+import lombok.Data;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/3/12 14:30
+ * @Description:
+ */
+@Data
+public class DailyProductionData {
+
+    @ExcelProperty(value = "鏃ユ湡")
+    @ExcelMerge(merge = true, isPrimaryKey = true)
+    private String productDate;
+
+    @ExcelProperty(value = {"鍒囧壊", "寮�濮嬫椂闂�"})
+    @ExcelMerge(merge = true)
+    private String edgBeginTime;
+    @ExcelProperty(value = {"鍒囧壊", "缁撴潫鏃堕棿"})
+    @ExcelMerge(merge = true)
+    private String edgEndTime;
+    @ExcelProperty(value = {"鍒囧壊", "鎬昏�楁椂"})
+    @ExcelMerge(merge = true)
+    private String edgTimeTotal;
+    @ExcelProperty(value = {"鍒囧壊", "绌洪棽鏃堕暱"})
+    @ExcelMerge(merge = true)
+    private String edgTimeFree;
+    @ExcelProperty(value = {"鍒囧壊", "宸ヤ綔鏃堕暱"})
+    @ExcelMerge(merge = true)
+    private String edgTimeDiff;
+    @ExcelProperty(value = {"鍒囧壊", "鎬荤墖鏁�"})
+    @ExcelMerge(merge = true)
+    private String countOut;
+    @ExcelProperty(value = {"鍒囧壊", "鎬婚潰绉�(m^2)"})
+    @ExcelMerge(merge = true)
+    private String totalAreaOut;
+
+
+    @ExcelProperty(value = {"閽㈠寲", "寮�濮嬫椂闂�"})
+    @ExcelMerge(merge = true)
+    private String bigBeginTime;
+    @ExcelProperty(value = {"閽㈠寲", "缁撴潫鏃堕棿"})
+    @ExcelMerge(merge = true)
+    private String bigEndTime;
+    @ExcelProperty(value = {"閽㈠寲", "鎬昏�楁椂"})
+    @ExcelMerge(merge = true)
+    private String bigTimeTotal;
+    @ExcelMerge(merge = true)
+    @ExcelProperty(value = {"閽㈠寲", "绌洪棽鏃堕暱"})
+    private String bigTimeFree;
+    @ExcelProperty(value = {"閽㈠寲", "宸ヤ綔鏃堕暱"})
+    @ExcelMerge(merge = true)
+    private String bigTimeDiff;
+    @ExcelProperty(value = {"閽㈠寲", "鎬荤倝鏁�"})
+    @ExcelMerge(merge = true)
+    private String temperingLayoutCount;
+    @ExcelProperty(value = {"閽㈠寲", "鎬荤墖鏁�"})
+    @ExcelMerge(merge = true)
+    private String temperingGlassCount;
+    @ExcelProperty(value = {"閽㈠寲", "鎬婚潰绉�(m^2)"})
+    @ExcelMerge(merge = true)
+    private String temperingArea;
+
+
+    @ExcelProperty(value = {"涓┖", "寮�濮嬫椂闂�"})
+    @ExcelMerge(merge = true)
+    private String hollowBeginTime;
+    @ExcelProperty(value = {"涓┖", "缁撴潫鏃堕棿"})
+    @ExcelMerge(merge = true)
+    private String hollowEndTime;
+    @ExcelProperty(value = {"涓┖", "鎬昏�楁椂"})
+    @ExcelMerge(merge = true)
+    private String hollowTimeTotal;
+    @ExcelProperty(value = {"涓┖", "绌洪棽鏃堕暱"})
+    @ExcelMerge(merge = true)
+    private String hollowTimeFree;
+    @ExcelProperty(value = {"涓┖", "宸ヤ綔鏃堕暱"})
+    @ExcelMerge(merge = true)
+    private String hollowTimeDiff;
+    @ExcelProperty(value = {"涓┖", "鎬荤墖鏁�"})
+    @ExcelMerge(merge = true)
+    private String hollowGlassCount;
+    @ExcelProperty(value = {"涓┖", "鎬婚潰绉�(m^2)"})
+    @ExcelMerge(merge = true)
+    private String hollowArea;
+
+    @ExcelProperty(value = {"宸ョ▼淇℃伅", "宸ョ▼鍙�"})
+    private String engineerId;
+    @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬荤墖閲�"})
+    private String glassTotal;
+    @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬婚潰绉�(m^2)"})
+    private String glassTotalArea;
+
+
+}

--
Gitblit v1.8.0