From e6c0c5a119c814b1ae777f14897e9e15daab8c50 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 04 八月 2022 14:15:02 +0800
Subject: [PATCH] 事故报告状态fix
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoDetailDO.java | 20 +++++-----
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfo.java | 20 +++++-----
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportQuery.java | 6 +-
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java | 10 +++++
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java | 20 +++++-----
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java | 20 +++++-----
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportDBQuery.java | 6 +-
7 files changed, 56 insertions(+), 46 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfo.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfo.java
index d76a9cc..5363e39 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfo.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfo.java
@@ -10,6 +10,16 @@
@TableName("accident_report")
public class AccidentReportInfo {
+ private Integer status;
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
private String fillInUserName;
public String getFillInUserName() {
@@ -32,8 +42,6 @@
private Long createUid;
private Long updateUid;
-
- private Boolean status ;
private Long accidentExpressId;
@@ -72,14 +80,6 @@
private String relevantPersonnelRecords;
private String otherMaterials;
-
- public Boolean getStatus() {
- return status;
- }
-
- public void setStatus(Boolean status) {
- this.status = status;
- }
public Long getId() {
return id;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoDetailDO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoDetailDO.java
index 13f8715..790db17 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoDetailDO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoDetailDO.java
@@ -11,6 +11,16 @@
@TableName("accident_report")
public class AccidentReportInfoDetailDO {
+ private Integer status;
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
private String fillInUserName;
public String getFillInUserName() {
@@ -31,8 +41,6 @@
@TableId(type = IdType.AUTO)
private Long id;
-
- private Boolean status ;
private Long accidentExpressId;
@@ -71,14 +79,6 @@
private String relevantPersonnelRecords;
private String otherMaterials;
-
- public Boolean getStatus() {
- return status;
- }
-
- public void setStatus(Boolean status) {
- this.status = status;
- }
public Long getId() {
return id;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java
index 7784288..120a251 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java
@@ -9,6 +9,16 @@
@TableName("accident_report")
public class AccidentReportInfoPageDO {
+ private Integer status;
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
private String accidentName;
private Long accidentDepartmentId;
@@ -22,8 +32,6 @@
private Long accidentExpressId;
- private Boolean status ;
-
private String accidentType;
private String accidentGrade;
@@ -34,14 +42,6 @@
public void setId(Long id) {
this.id = id;
- }
-
- public Boolean getStatus() {
- return status;
- }
-
- public void setStatus(Boolean status) {
- this.status = status;
}
public Long getAccidentExpressId() {
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
index be63047..839b073 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
@@ -8,6 +8,16 @@
public class AccidentReportReqDTO {
+ private Integer status;
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
private String fillInUserName;
public String getFillInUserName() {
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java
index 3ffa1fd..492bcf6 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportDetailRespDTO.java
@@ -9,6 +9,16 @@
public class AccidentReportDetailRespDTO {
+ private Integer status;
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
private String fillInUserName;
public String getFillInUserName() {
@@ -62,8 +72,6 @@
private Long id;
- private Boolean status ;
-
private Long accidentExpressId;
private String accidentType;
@@ -105,14 +113,6 @@
private String otherMaterials;
private List<AccidentReportFileRespDTO> fileList;
-
- public Boolean getStatus() {
- return status;
- }
-
- public void setStatus(Boolean status) {
- this.status = status;
- }
public Long getId() {
return id;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportQuery.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportQuery.java
index 0cc73e1..a00ecaa 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportQuery.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportQuery.java
@@ -2,13 +2,13 @@
public class AccidentReportQuery {
- private Boolean status;
+ private Integer status;
- public Boolean getStatus() {
+ public Integer getStatus() {
return status;
}
- public void setStatus(Boolean status) {
+ public void setStatus(Integer status) {
this.status = status;
}
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportDBQuery.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportDBQuery.java
index 99039d4..992d86f 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportDBQuery.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportDBQuery.java
@@ -2,13 +2,13 @@
public class AccidentReportDBQuery {
- private Boolean status;
+ private Integer status;
- public Boolean getStatus() {
+ public Integer getStatus() {
return status;
}
- public void setStatus(Boolean status) {
+ public void setStatus(Integer status) {
this.status = status;
}
}
--
Gitblit v1.9.2