From ecb8ee9c13ef1d4b7c0324dcd39e3ae34d9ce5b5 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 14 Sep 2024 23:21:05 +0800
Subject: [PATCH] 1、自行受理bug修复2 2、流程进度展示bug修复2

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseInfo.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 045eaf2..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
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -47,6 +48,7 @@
     /**
     * 来访时间
     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
     @TableField(value = "visit_time")
     private Date visitTime;
 
@@ -95,6 +97,7 @@
     /**
     * 纠纷发生时间
     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone="GMT+8")
     @TableField(value = "occur_time")
     private Date occurTime;
 
@@ -351,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;
@@ -373,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;
 
     /**
      * 意向调解组织编号
@@ -414,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