From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对(未明确) 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检,抽检的话是抽多少百分比 6.供应商管理东西太少了,没有资质文件啊这些东西(是不是可以参考pro) 7.采购审批把人从李莹莹改成龙红星

---
 src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java |  104 +++++++++++++++++++++++++---------------------------
 1 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index be5d472..9b60ca8 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -1,84 +1,80 @@
 package com.ruoyi.quality.pojo;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.Date;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
- * 璐ㄩ噺绠$悊--妫�娴嬫寚鏍囩淮鎶�
- * quality_test_standard
+ * <p>
+ * 妫�娴嬫爣鍑嗕富琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 03:40:24
  */
-@TableName(value = "quality_test_standard")
-@Data
+@Getter
+@Setter
+@TableName("quality_test_standard")
+@Schema(name = "QualityTestStandard瀵硅薄", description = "妫�娴嬫爣鍑嗕富琛�")
 public class QualityTestStandard implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 搴忓彿
-     */
-    @TableId(type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    @Schema(description = "鏍囧噯缂栧彿")
+    private String standardNo;
 
-    /**
-     * 鎸囨爣
-     */
-    @Excel(name = "鎸囨爣")
-    private String parameterItem;
+    @Schema(description = "鏍囧噯鍚嶇О")
+    private String standardName;
 
-    /**
-     * 鍗曚綅
-     */
-    @Excel(name = "鍗曚綅")
-    private String unit;
+    @Schema(description = "澶囨敞")
+    private String remark;
 
-    /**
-     * 鏍囧噯鍊�
-     */
-    @Excel(name = "鏍囧噯鍊�")
-    private String standardValue;
-
-    /**
-     * 鍐呮帶鍊�
-     */
-    @Excel(name = "鍐呮帶鍊�")
-    private String controlValue;
-
-    /**
-     * 鍏宠仈浜у搧id
-     */
-    @NotBlank(message = "浜у搧id涓嶈兘涓虹┖!")
-    @Excel(name = "鍏宠仈浜у搧id")
-    private Long productId;
-
-
-
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @Schema(description = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
-    private Integer createUser;
+    private Long createUser;
 
-    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @Schema(description = "淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+    @Schema(description = "淇敼鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Integer updateUser;
+    private Long updateUser;
 
-    @ApiModelProperty(value = "绉熸埛ID")
+    @Schema(description = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    @Schema(description = "鐘舵��")
+    private String state;
 
+    @Schema(description = "绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
+    private Integer inspectType;
+
+    @Schema(description = "宸ュ簭id")
+    private Integer processId;
+
+    @Schema(description = "妫�楠岃鍒�: 0=鍏ㄦ, 1=鎶芥")
+    private Integer inspectRule;
+
+    @Schema(description = "鎶芥姣斾緥(鐧惧垎姣�), 浠卛nspectRule=1鏃舵湁鏁�, 濡�10琛ㄧず10%")
+    private java.math.BigDecimal sampleRatio;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3