From ba714cd764bb95cb00c57e93017905c5a03e4079 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 30 十月 2025 12:12:14 +0800
Subject: [PATCH] 1、 二号线禁用时且一拖二情况下优化
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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
index 89e8ab7..6f44066 100644
--- 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
@@ -13,8 +13,15 @@
public class DailyProductionData {
@ExcelProperty(value = "鏃ユ湡")
- @ExcelMerge(merge = true)
+ @ExcelMerge(merge = true, isPrimaryKey = true)
private String productDate;
+
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "宸ョ▼鍙�"})
+ private String engineerId;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬荤墖閲�"})
+ private String glassTotal;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬婚潰绉�(m^2)"})
+ private String glassTotalArea;
@ExcelProperty(value = {"鍒囧壊", "寮�濮嬫椂闂�"})
@ExcelMerge(merge = true)
@@ -87,12 +94,7 @@
@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