From c490640493f04e2ed0fc5c4c8fbc92ebdd4d5380 Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Tue, 24 Jun 2025 21:06:48 +0800
Subject: [PATCH] Merge branch 'gzdyh_prod'

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsBaseDTO.java |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsBaseDTO.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsBaseDTO.java
index 419b3f0..4b4617d 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsBaseDTO.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseStatisticsBaseDTO.java
@@ -1,6 +1,8 @@
 package cn.huge.module.cases.domain.dto;
 
 import lombok.Data;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -10,28 +12,32 @@
 @Data
 public class CaseStatisticsBaseDTO {
     private Integer totalNum=0;//总记录数
-     private Integer processNum=0;//办理中数量
-     private Integer finishNum=0;//已结案数量
-     private Integer rejectNum=0;//不予受理数量
-     private Integer resolveNum=0;//化解成功数量
-     private String resolveRate;//化解成功率
-     private Integer unResolveNum=0;//化解不成功数量
-     private String unResolveRate;//化解不成功率
-     private Integer resolveingNum=0;//化解中数量
-     private String resolveingRate;//化解中率
-//    private Integer rejectNum=0;//不予受理数量
+    // private Integer processNum=0;//办理中数量
+    // private Integer finishNum=0;//已结案数量
+    // private Integer rejectNum=0;//不予受理数量
+    // private Integer resolveNum=0;//化解成功数量
+    // private String resolveRate;//化解成功率
+    // private Integer unResolveNum=0;//化解不成功数量
+    // private String unResolveRate;//化解不成功率
+    // private Integer resolveingNum=0;//化解中数量
+    // private String resolveingRate;//化解中率
+    private Integer rejectNum=0;//不予受理数量
     private String rejectRate;//不予受理率
-//    private Integer processNum=0;//化解中数量
+    private Integer processNum=0;//化解中数量
     private String processRate;//化解中率
-//    private Integer finishNum=0;//化解成功数量
+    private Integer finishNum=0;//化解成功数量
     private String finishRate;//化解成功率
     private Integer failNum=0;//化解不成功数量
     private String failRate;//化解不成功率
 
-    private Integer toDayTotalNum=0;//今日新增总记录数
-    private Integer toDayProcessNum=0;//今日新增化解中数
-    private Integer toDayRejectNum=0;//今日新增不予受理数量
-    private Integer toDayFinishNum=0;//今日新增已结案数量
+    private Integer bmpcNum;//部门排查
+    private String bmpcCode="22_00003-8";//部门排查编码
+    private Integer wgpcNum;//网格排查
+    private String wgpcCode="22_00003-2";//网格排查编码
+    private Integer fjwjfNum;//非警务纠纷
+    private String fjwjfCode="22_00003-1";//非警务纠纷编码
+    private Integer zxjfNum;//专项纠纷
+    private String zxjfCode="22_00003-7";//专项纠纷编码
 
     private Integer oneLevelNum=0;//1级事件数量
     private Integer twoLevelNum=0;//2级事件数量
@@ -48,7 +54,7 @@
     private CaseStatisticsSourceDTO oneSecondSource;//非警务纠纷
     private CaseStatisticsSourceDTO twoSecondSource;//12345
     private CaseStatisticsSourceDTO threeSecondSource;//网格上报
-    private List<CaseStatisticsTypeDTO> typeList;//纠纷类型集合
+    private List<CaseStatisticsTypeDTO> typeList = new ArrayList<>();//纠纷类型集合
 
     private List<CasePageDTO> caseList;//案件集合(实时动态)
 
@@ -66,8 +72,8 @@
     private String xfRate;//信访占比
     private Integer ldzcNum=0;//劳动仲裁数
     private String ldzcRate;//劳动仲裁占比
-    private Integer fjwjfNum=0;//非警务纠纷数
-    private String fjwjfRate;//非警务纠纷占比
+    private Integer tzfjwjfNum=0;//非警务纠纷数
+    private String tzfjwjfRate;//非警务纠纷占比
 
 //    private Integer allNum=0;//全部数
 //    private Integer sysNum=0;//本系统数

--
Gitblit v1.8.0