From abb0d631ffed8b67b0a78205ba127b46a4cb546b Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Tue, 10 Sep 2024 16:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java
index bbe88f5..f15fc77 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java
@@ -354,7 +354,7 @@
private Integer inputWay;
/**
- * 事项状态，1：待签收，2：待受理，3：办理中，4：结案审核，5：待评价，6：已归档
+ * 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
*/
@TableField(value = "status")
private Integer status;
@@ -376,6 +376,18 @@
*/
@TableField(value = "process_name")
private String processName;
+
+ /**
+ * 对外展示事项进度，1：待受理，2：办理中，3：已结案
+ */
+ @TableField(value = "info_process")
+ private Integer infoProcess;
+
+ /**
+ * 对外展示事项进度
+ */
+ @TableField(value = "info_process_name")
+ private String infoProcessName;
/**
* 意向调解组织编号
@@ -417,12 +429,14 @@
/**
* 创建时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "create_time")
private Date createTime;
/**
* 更新时间
*/
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
@TableField(value = "update_time")
private Date updateTime;
--
Gitblit v1.8.0