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 | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
index 437391c..9b60ca8 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityTestStandard.java
@@ -8,8 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,50 +23,58 @@
@Getter
@Setter
@TableName("quality_test_standard")
-@ApiModel(value = "QualityTestStandard瀵硅薄", description = "妫�娴嬫爣鍑嗕富琛�")
+@Schema(name = "QualityTestStandard瀵硅薄", description = "妫�娴嬫爣鍑嗕富琛�")
public class QualityTestStandard implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
- @ApiModelProperty("鏍囧噯缂栧彿")
+ @Schema(description = "鏍囧噯缂栧彿")
private String standardNo;
- @ApiModelProperty("鏍囧噯鍚嶇О")
+ @Schema(description = "鏍囧噯鍚嶇О")
private String standardName;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("鐘舵��")
- @TableLogic
+ @Schema(description = "鐘舵��")
private String state;
- @ApiModelProperty("绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
+ @Schema(description = "绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)")
private Integer inspectType;
- @ApiModelProperty("宸ュ簭id")
+ @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