From 76746dcdb6f0572c4b3349056421369aa7a34b09 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 11:12:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
new file mode 100644
index 0000000..4c98910
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/TeamOutputDTO.java
@@ -0,0 +1,60 @@
+package com.example.erp.dto.pp;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TeamOutputDTO {
+ @ExcelProperty("鎶ュ伐鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportingWorkTime;
+ @ExcelProperty("鎶ュ伐宸ュ簭")
+ private String thisProcess;
+ @ExcelProperty("鎶ュ伐鐝粍")
+ private String teamsGroupsName;
+ @ExcelProperty("璁㈠崟缂栧彿")
+ private String orderId;
+ @ExcelProperty("椤圭洰鍚嶇О")
+ private String project;
+ @ExcelProperty("娴佺▼鍗″彿")
+ private String processId;
+ @ExcelProperty("搴忓彿")
+ private Integer orderNumber;
+ @ExcelProperty("瀹�")
+ private Integer width;
+ @ExcelProperty("楂�")
+ private Integer height;
+// @ExcelProperty("褰㈢姸")
+// private String shape;
+// @ExcelProperty("鍘氬害")
+// private String thickness;
+ @ExcelProperty("纾ㄨ竟绫诲瀷")
+ private String edgingType;
+ @ExcelProperty("瀹屽伐鏁伴噺")
+ private Integer completedQuantity;
+ @ExcelProperty("瀹屽伐闈㈢Н")
+ private Double area;
+ @ExcelProperty("浜у搧鍚嶇О")
+ private String productName;
+ @ExcelProperty("缂栧彿")
+ private String code;
+ @ExcelProperty("瀹℃牳浜�")
+ private String reviewed;
+ @ExcelProperty("瀹℃牳鏃堕棿")
+ private String examineTime;
+ @ExcelProperty("鍦ㄥ埗鍝佸悕绉�")
+ private String workProcessName;
+ @ExcelProperty("鎶ュ伐璁惧")
+ private String deviceName;
+ @ExcelProperty("鎵规")
+ private String batch;
+ @ExcelProperty("璁㈠崟绫诲瀷")
+ private String orderType;
+ @ExcelProperty("鍦ㄥ埗鍝佸帤搴�")
+ private Double thicknessSum;
+ @ExcelProperty("骞虫柟姣背")
+ private Double thicknessArea;
+}
--
Gitblit v1.8.0