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/CaseInfoWeExcelDTO.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
index 3e29169..0e1199a 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java
@@ -9,22 +9,29 @@
  */
 @Data
 public class CaseInfoWeExcelDTO {
-    @ExcelProperty(value="事项状态")
-    private String statusName;
+    @ExcelProperty(value="登记时间")
+    private String createTime;
+    @ExcelProperty(value="登记机构")
+    private String inputUnitName;
+    @ExcelProperty(value="问题归属地")
+    private String areaName;
     @ExcelProperty(value="事项来源")
     private String canalName;
     @ExcelProperty(value="事项等级")
     private Integer caseLevel;
     @ExcelProperty(value="纠纷类型")
     private String caseTypeName;
-    @ExcelProperty(value="调解结果")
+    @ExcelProperty(value="承办部门")
+    private String mediateUnitName;
+    @ExcelProperty(value="事项状态")
+    private String statusName;
+    @ExcelProperty(value="办结时间")
+    private String closeTime;
+    @ExcelProperty(value="化解结果")
     private String mediResultName;
-    @ExcelProperty(value="实际调解部门")
-    private String mediateDeptName;
-    @ExcelProperty(value="登记组织")
-    private String inputUnitName;
     @ExcelProperty(value="申请人")
-    private String plaintiffStr;
+    private String plaintiffs;
     @ExcelProperty(value="被申请人")
-    private String defendantStr;
+    private String defendants;
+
 }

--
Gitblit v1.8.0