From 2ee9e158e3129070f6b1fd953da1540f05d4f2b0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 10 七月 2026 18:04:50 +0800
Subject: [PATCH] 修改报工
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 31984af..e6cb765 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -47,7 +47,7 @@
/**
* 妫�娴嬫棩鏈�
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
@@ -99,6 +99,24 @@
private String dealResult;
/**
+ * 涓嶅悎鏍煎浘鐗�
+ */
+ @Excel(name = "涓嶅悎鏍煎浘鐗�")
+ private String photoUrls;
+
+ @Schema(description = "涓嶅悎鏍煎鐞嗙被鍨嬶細0杞诲井杩斿伐锛�1涓ラ噸杩斿伐锛�2鎶ュ簾")
+ @Excel(name = "涓嶅悎鏍煎鐞嗙被鍨�", readConverterExp = "0=杞诲井杩斿伐,1=涓ラ噸杩斿伐,2=鎶ュ簾")
+ private Integer dealType;
+
+ @Schema(description = "淇悊宸ユ椂")
+ @Excel(name = "淇悊宸ユ椂")
+ private BigDecimal repairWorkHour;
+
+ @Schema(description = "鏄惁閲嶆柊鐢熸垚鏂板崟锛�0鍚︼紝1鏄�")
+ @Excel(name = "鏄惁閲嶆柊鐢熸垚鏂板崟", readConverterExp = "0=鍚�,1=鏄�")
+ private Integer regenerateNewOrder;
+
+ /**
* 澶勭悊浜�
*/
@Excel(name = "澶勭悊浜�")
@@ -107,7 +125,7 @@
/**
* 澶勭悊鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date dealTime;
@@ -143,4 +161,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+
+ @Schema(description = "鍏宠仈浜у搧鍨嬪彿id")
+ private Long productModelId;
}
--
Gitblit v1.9.3