From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java |  124 +++++++++++++++++++++++------------------
 1 files changed, 70 insertions(+), 54 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 9022bbb..7066295 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
@@ -1,8 +1,25 @@
 package com.gkhy.safePlatform.emergency.model.dto.resp;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
 public class EmergencyWorkApprovePageRespDTO {
+    //排序
+    private Integer sort ;
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 
     private Long id;
+    //更新时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date gmtCreate;
 
     //流程名称
     private String workName;
@@ -10,20 +27,59 @@
     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;
-    //关联业务类型 1:目标检查 2:目标上报
-    private Integer relateType;
-    //关联的审批对象表ID
-    private Long relateId;
-    //关联业务说明
-    private String relateDesc;
+
+    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;
@@ -33,6 +89,13 @@
         this.id = id;
     }
 
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
 
     public String getWorkName() {
         return workName;
@@ -58,13 +121,6 @@
         this.submitPersonId = submitPersonId;
     }
 
-    public Long getApprovePersonId() {
-        return approvePersonId;
-    }
-
-    public void setApprovePersonId(Long approvePersonId) {
-        this.approvePersonId = approvePersonId;
-    }
 
     public Integer getApproveStatus() {
         return approveStatus;
@@ -72,45 +128,5 @@
 
     public void setApproveStatus(Integer approveStatus) {
         this.approveStatus = approveStatus;
-    }
-
-    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 Integer getRelateType() {
-        return relateType;
-    }
-
-    public void setRelateType(Integer relateType) {
-        this.relateType = relateType;
-    }
-
-    public Long getRelateId() {
-        return relateId;
-    }
-
-    public void setRelateId(Long relateId) {
-        this.relateId = relateId;
-    }
-
-    public String getRelateDesc() {
-        return relateDesc;
-    }
-
-    public void setRelateDesc(String relateDesc) {
-        this.relateDesc = relateDesc;
     }
 }

--
Gitblit v1.9.2