From b72086c16e178ea31a865646aeb64bea210e48b7 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Fri, 09 May 2025 14:57:02 +0800
Subject: [PATCH] 修正
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlan.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlan.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlan.java
index 25b801b..7265fd0 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlan.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/entity/RiskAssessPlan.java
@@ -1,13 +1,19 @@
package com.gkhy.labRiskManage.domain.riskReport.entity;
+import com.gkhy.labRiskManage.domain.account.entity.Role;
+import com.gkhy.labRiskManage.domain.account.entity.User;
import com.gkhy.labRiskManage.domain.basic.entity.BasicTip;
import lombok.Data;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.hibernate.annotations.Where;
import javax.persistence.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import java.io.Serializable;
+import java.util.List;
/**
*
@@ -15,6 +21,7 @@
@Data
@Entity
@Table(name = "risk_assess_plan")
+@Where(clause = "delete_status = 0")
public class RiskAssessPlan implements Serializable {
private static final long serialVersionUID = -44756780317221858L;
@@ -94,6 +101,11 @@
* 辨识方法：1-PHA；2-JHA；3-SCL；4-HAZOP；5-类比法
*/
private Byte identificationMethod;
+
+ /**
+ * 辨识类型1线上专家2现场专家3线上+现场
+ */
+ private Byte identificationType;
/**
* 辨识专家
*/
@@ -159,7 +171,19 @@
*/
private Byte manageLevel;
+ @OneToOne(targetEntity = User.class,fetch = FetchType.EAGER)
+ @JoinColumn(name = "planUserId",referencedColumnName = "id",insertable =false ,updatable = false)
+ private User planUser;
+ @OneToMany(fetch = FetchType.EAGER,cascade = {CascadeType.REFRESH})
+ @Fetch(FetchMode.SUBSELECT)
+ @JoinColumn(name = "riskAssessPlanId",referencedColumnName = "id",insertable =false ,updatable = false)
+ private List<RiskAssessPlanIdentificationUser> riskAssessPlanIdentificationUsers;
+
+ @OneToMany(fetch = FetchType.EAGER,cascade = {CascadeType.REFRESH})
+ @Fetch(FetchMode.SUBSELECT)
+ @JoinColumn(name = "riskAssessPlanId",referencedColumnName = "id",insertable =false ,updatable = false)
+ private List<RiskAssessPlanEvaluateUser> riskAssessPlanEvaluateUsers;
}
--
Gitblit v1.9.2