From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
index 3987eb2..d21ae8c 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/FrontPageListDTO.java
@@ -1,5 +1,6 @@
package cn.huge.module.cases.domain.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -7,13 +8,30 @@
@Data
public class FrontPageListDTO {
/**
+ * 所属编号
+ */
+ private String windupId;
+
+ /**
+ * 所属编号
+ */
+ private String ownerId;
+
+ /**
+ * 事项ID
+ */
+ private String caseId;
+
+ /**
* 流转时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
private Date turnaroundTime;
/**
* 时限
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
private Date timeLimit;
/**
@@ -44,7 +62,7 @@
/**
* 已办天数
*/
- private Integer processingDays;
+ private Long processingDays;
/**
* 承办部门
@@ -81,5 +99,45 @@
*/
private String opinion;
+ /**
+ * 事项状态
+ */
+ private String process;
+ /**
+ * 申请类型
+ */
+ private String applyType;
+
+ /**
+ * 申请进度
+ */
+ private String applyStatus;
+
+ /**
+ * 审核部门
+ */
+ private String auditDept;
+
+ /**
+ * 办理结果
+ */
+ private String auditResult;
+
+ /**
+ * 内容
+ */
+ private String content;
+
+ /**
+ * 审核时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date auditTime;
+
+ /**
+ * 审核时间
+ */
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
+ private Date replyTime;
}
--
Gitblit v1.8.0