From 18b4be9e6b7e8319c2e02b20b9f9b0a422c352a5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 28 五月 2024 15:58:13 +0800
Subject: [PATCH] 部分报表导出,修改报工新增后质检状态不正确问题,修改报工编辑后查询数据错误问题

---
 north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java b/north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java
index 1960a53..9fc64ce 100644
--- a/north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java
+++ b/north-glass-erp/src/main/java/com/example/erp/dto/pp/CrossProcessBreakingDTO.java
@@ -1,4 +1,36 @@
 package com.example.erp.dto.pp;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @author SNG-016
+ */
+@Data
 public class CrossProcessBreakingDTO {
+    @ExcelProperty("鎶ュ伐鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime reportingWorkTime;
+    @ExcelProperty("璐d换宸ュ簭")
+    private String responsibleProcess;
+    @ExcelProperty("璐d换鐝粍")
+    private String responsibleTeam;
+    @ExcelProperty("娆$牬绫诲瀷")
+    private String breakageType;
+    @ExcelProperty("娆$牬鍘熷洜")
+    private String breakageReason;
+    @ExcelProperty("娆$牬鏁伴噺")
+    private Integer breakageQuantity;
+    @ExcelProperty("娆$牬闈㈢Н")
+    private Double area;
+    @ExcelProperty("椤圭洰鍚嶇О")
+    private String project;
+    @ExcelProperty("閿�鍞崟鍙�")
+    private String orderId;
+    @ExcelProperty("鍗曠墖鍚嶇О")
+    private String glassChild;
 }

--
Gitblit v1.8.0