From c4354b452cb7b09fe28a9e8ea81f455df1c68de8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 05 八月 2022 17:02:59 +0800
Subject: [PATCH] 流程fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
index 13db6b4..88df0b6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
@@ -7,7 +7,6 @@
public class EmergencyWorkApprovePageRespDTO {
private Long id;
-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gmtCreate;
@@ -17,9 +16,60 @@
private String title;
//提交人ID/外键
private Long submitPersonId;
+ //提交人名称/外键
+ private String submitPersonName;
+ //审批人ID/外键
+ private Long approvePersonId;
+ //审批人名称/外键
+ private String approvePersonName;
//审批状态 1：未审批 2：审批中 3：审批完成
private Integer approveStatus;
+ //审批意见
+ private Boolean approveResult;
+ //审批意见备注
+ private String approveMemo;
+
+ public String getSubmitPersonName() {
+ return submitPersonName;
+ }
+
+ public void setSubmitPersonName(String submitPersonName) {
+ this.submitPersonName = submitPersonName;
+ }
+
+ public Long getApprovePersonId() {
+ return approvePersonId;
+ }
+
+ public void setApprovePersonId(Long approvePersonId) {
+ this.approvePersonId = approvePersonId;
+ }
+
+ public String getApprovePersonName() {
+ return approvePersonName;
+ }
+
+ public void setApprovePersonName(String approvePersonName) {
+ this.approvePersonName = approvePersonName;
+ }
+
+ public Boolean getApproveResult() {
+ return approveResult;
+ }
+
+ public void setApproveResult(Boolean approveResult) {
+ this.approveResult = approveResult;
+ }
+
+ public String getApproveMemo() {
+ return approveMemo;
+ }
+
+ public void setApproveMemo(String approveMemo) {
+ this.approveMemo = approveMemo;
+ }
+
public Long getId() {
return id;
}
--
Gitblit v1.9.2