From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ReliabilityAssess.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ReliabilityAssess.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ReliabilityAssess.java
index ef1a43d..06ae446 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ReliabilityAssess.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ReliabilityAssess.java
@@ -1,22 +1,42 @@
package com.zt.life.modules.mainPart.taskReliability.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
+import com.zt.common.entity.TreeNode;
+import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
@TableName("assess_data")
-public class ReliabilityAssess extends BusiEntity {
+public class ReliabilityAssess extends BusiEntity implements TreeNode<ReliabilityAssess> {
private Double runTimes;
private Integer runNum;
private Integer failNum;
- private String assessResult;
+ private Double assessResult;
private Long itemId;
private Long productId;
+ private Long id;
+
+ @TableField(exist = false)
+ private String name;
+
+ @TableField(exist = false)
+ private Integer type;
+
+ @TableField(exist = false)
+ private Long pid;
+
+ @ApiModelProperty(value = "瀛愯妭鐐�")
+ @TableField(exist = false)
+ private List<ReliabilityAssess> children = new ArrayList<>();
}
--
Gitblit v1.9.1