From 7828b982da116070fe11526733609ecce23631b6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 15 五月 2026 19:55:28 +0800
Subject: [PATCH] feat: 设备维修新增报修人、验收人、维修人
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 4207b8b..3cb7eaf 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@@ -19,6 +20,7 @@
*/
@TableName(value = "quality_inspect")
@Data
+@EqualsAndHashCode(callSuper = true)
public class QualityInspect extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,7 +33,7 @@
/**
* 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
*/
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆", readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!")
private Integer inspectType;
@@ -41,8 +43,6 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
-
-
/**
@@ -94,10 +94,28 @@
private String unit;
/**
- * 鏁伴噺
+ * 鏁伴噺锛堟�绘暟閲忥紝鍒涘缓鍚庝笉鍙慨鏀癸級
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
+
+ /**
+ * 鍚堟牸鏁伴噺
+ */
+ @Excel(name = "鍚堟牸鏁伴噺")
+ private BigDecimal qualifiedQuantity;
+
+ /**
+ * 涓嶅悎鏍兼暟閲�
+ */
+ @Excel(name = "涓嶅悎鏍兼暟閲�")
+ private BigDecimal unqualifiedQuantity;
+
+ /**
+ * 鍚堟牸鐜囷紙%锛�
+ */
+ @Excel(name = "鍚堟牸鐜�")
+ private BigDecimal passRate;
/**
* 妫�娴嬪崟浣�
@@ -110,7 +128,6 @@
*/
@Excel(name = "妫�娴嬬粨鏋�")
private String checkResult;
-
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -144,7 +161,29 @@
* 鎶ュ伐id
*/
private Long productMainId;
+
+ private Long productModelId;
//涓嶅悎鏍肩幇璞�
private String defectivePhenomena;
+ @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+ private Long testStandardId;
+
+ @ApiModelProperty("鍏ュ簱瀹℃壒鐘舵�侊細1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触")
+ private Integer approvalStatus;
+
+ @ApiModelProperty("鍏ュ簱瀹℃壒浜篿d")
+ private String approveUserIds;
+
+
+ @TableField(exist = false)
+ private String workOrderNo;
+ @TableField(exist = false)
+ private String purchaseContractNo;
+
+ /**
+ * 鍘氬害
+ */
+ @TableField(exist = false)
+ private BigDecimal thickness;
}
--
Gitblit v1.9.3