From 1b50d8ee33a7ccdac2b7963343acf7d97f05f78f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 四月 2026 09:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_君歌化工' into dev_天津_君歌化工
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 2479add..ecfca49 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,7 +19,7 @@
*/
@TableName(value = "quality_unqualified")
@Data
-public class QualityUnqualified implements Serializable {
+public class QualityUnqualified extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -132,5 +133,38 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty("鍏宠仈妫�娴媔d")
+ private Long inspectId;
+
+ @ApiModelProperty("鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
+ @TableField(exist = false)
+ private Boolean method;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ /**
+ * 鍘熷洜鍒嗘瀽
+ */
+ @Excel(name = "鍘熷洜鍒嗘瀽")
+ private String reasonAnalysis;
+
+ /**
+ * 棰勯槻涓庣籂姝ｆ帾鏂�
+ */
+ @Excel(name = "棰勯槻涓庣籂姝ｆ帾鏂�")
+ private String preventiveCorrective;
+
+ /**
+ * 宸ユ椂鎹熷け
+ */
+ @Excel(name = "宸ユ椂鎹熷け")
+ private String lossWorking;
+
+ /**
+ * 鏉愭枡璐规崯澶�
+ */
+ @Excel(name = "鏉愭枡璐规崯澶�")
+ private String lossMaterial;
}
--
Gitblit v1.9.3