From 5f77609d5118737e135c6ca3add168ad01aa52b6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 05 十一月 2024 16:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
index 05ca44e..d1e0d80 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhaseModel.java
@@ -3,12 +3,11 @@
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.taskReliability.dto.TaskPhaseConstraintDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -20,34 +19,39 @@
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("task_phase_model")
-public class TaskPhaseModel extends BusiEntity implements TreeNode<TaskPhaseModel> {
+public class TaskPhaseModel extends BusiEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "闃舵ID")
private Long phaseId;
- @ApiModelProperty(value = "浜у搧鑺傜偣ID")
+ @TableField(exist = false)
private Long productId;
- @ApiModelProperty(value = "妯″瀷ID")
- private Long modelId;
+ @ApiModelProperty(value = "宸ュ喌ID")
+ private Long operatConditId;
+
+ @ApiModelProperty(value = "宸ュ喌鍚嶇О")
+ private String operatConditName;
+
+ @ApiModelProperty(value = "宸ュ喌杩愯姣�")
+ private double operatConditDurationRate;
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "")
- private Integer status;
+ @TableField(exist = false)
+ private List<TaskPhaseModel> dataThreeList;
@TableField(exist = false)
- private String system;
+ private String isCheck;
+ @ApiModelProperty(value = "宸ュ喌杩愯鏃堕暱")
@TableField(exist = false)
- private String modelName;
+ private double operatConditDuration;
- @ApiModelProperty(value = "瀛愯妭鐐�")
+ @ApiModelProperty(value = "闃舵绾︽潫")
@TableField(exist = false)
- private List<TaskPhaseModel> children = new ArrayList<>();
+ private List<TaskPhaseConstraintDto> phaseConstraints;
- @TableField(exist = false)
- private Long pid;
}
--
Gitblit v1.9.1