From 7c5849b2e532a42a3136157ede6ef57b69f8212b Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Sat, 05 Jul 2025 16:50:48 +0800
Subject: [PATCH] fix:sql脚本
---
sql/20250704.sql | 27 +++++++++++--
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 67 ++++++++++++++-------------------
2 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index db07ccf..1225c55 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -1526,30 +1526,23 @@
sortType(caseStatisticsTypeDTOS);
}
Integer typeTotalNum = 0;
- Integer otherCaseNum = 0;
- int i = 1;
- List<CaseStatisticsTypeDTO> typeList = new ArrayList<>();
+
for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
typeTotalNum = typeTotalNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
- if (i < 6 && !"其他".equals(caseStatisticsTypeDTO.getCaseTypeName())) {
- typeList.add(caseStatisticsTypeDTO);
- i++;
- } else {
- otherCaseNum = otherCaseNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
- }
- }
- for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : typeList) {
- caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
- }
- if (otherCaseNum > 0) {
- CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
- caseStatisticsTypeDTO.setCaseTypeName("其他");
- caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
- caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
- typeList.add(caseStatisticsTypeDTO);
- caseStatisticsBaseDTO.setTypeList(typeList);
- }
+ }
+ for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
+ caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
+ }
+// if (otherCaseNum > 0) {
+// CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
+// caseStatisticsTypeDTO.setCaseTypeName("其他");
+// caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
+// caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
+// typeList.add(caseStatisticsTypeDTO);
+// caseStatisticsBaseDTO.setTypeList(typeList);
+// }
+ caseStatisticsBaseDTO.setTypeList(caseStatisticsTypeDTOS);
//事项来源
terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
CaseStatisticsSourceDTO oneSource = mapper.statisticsSource(terms);
@@ -2267,29 +2260,25 @@
sortType(caseStatisticsTypeDTOS);
}
Integer typeTotalNum = 0;
- Integer otherCaseNum = 0;
- int i = 1;
- List<CaseStatisticsTypeDTO> typeList = new ArrayList<>();
+// Integer otherCaseNum = 0;
+// int i = 1;
+// List<CaseStatisticsTypeDTO> typeList = new ArrayList<>();
for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
typeTotalNum = typeTotalNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
- if (i < 6 && !"其他".equals(caseStatisticsTypeDTO.getCaseTypeName())) {
- typeList.add(caseStatisticsTypeDTO);
- i++;
- } else {
- otherCaseNum = otherCaseNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
- }
+
}
- for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : typeList) {
+ for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
}
- if (otherCaseNum > 0) {
- CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
- caseStatisticsTypeDTO.setCaseTypeName("其他");
- caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
- caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
- typeList.add(caseStatisticsTypeDTO);
- caseStatisticsBaseDTO.setTypeList(typeList);
- }
+// if (otherCaseNum > 0) {
+// CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
+// caseStatisticsTypeDTO.setCaseTypeName("其他");
+// caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
+// caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
+// typeList.add(caseStatisticsTypeDTO);
+// caseStatisticsBaseDTO.setTypeList(typeList);
+// }
+ caseStatisticsBaseDTO.setTypeList(caseStatisticsTypeDTOS);
}
List<QueAreaDTO> queArea = listAreaByType(areaCode);
diff --git a/sql/20250704.sql b/sql/20250704.sql
index fb41852..dd6e0f1 100644
--- a/sql/20250704.sql
+++ b/sql/20250704.sql
@@ -42,15 +42,34 @@
insert into "HUGETEST"."dyh_sy_cause"("id", "name", "level", "parent_id", "issue_id", "create_time", "update_time", "icon") VALUES('24_02-76','涉法涉诉纠纷','2','24_01-11',null,'2025-07-04','2025-07-04',null);
+delete from dyh_sy_cause where id ='24_02-51';
+delete from dyh_sy_cause where id = '24_02-52';
+delete from dyh_sy_cause where id = '24_02-56';
+delete from dyh_sy_cause where id = '24_02-67';
+delete from dyh_sy_cause where id ='24_02-70';
+delete from dyh_sy_cause where id = '24_02-71';
+
+
+update "dyh_sy_cause" set parent_id = '24_01-1' where id='24_02-59';
+update "dyh_sy_cause" set parent_id = '24_01-1' where id='24_02-69';
+update "dyh_sy_cause" set parent_id = '24_01-1' where id='24_02-62';
+update "dyh_sy_cause" set parent_id = '24_01-1' where id='24_02-60';
+update "dyh_sy_cause" set parent_id = '24_01-4' where id='24_02-58';
+update "dyh_sy_cause" set parent_id = '24_01-7' where id='24_02-65';
+update "dyh_sy_cause" set parent_id = '24_01-7' where id='24_02-64';
+update "dyh_sy_cause" set parent_id = '24_01-7' where id='24_02-68';
+update "dyh_sy_cause" set parent_id = '24_01-7' where id='24_02-66';
+update "dyh_sy_cause" set parent_id = '24_01-9' where id='24_02-57';
+update "dyh_sy_cause" set parent_id = '24_01-9' where id='24_02-61';
+update "dyh_sy_cause" set parent_id = '24_01-9' where id='24_02-63';
-
-
-
-
+update "dyh_case_info" set case_type_first = '24_01-3' ,case_type_first_name='城市管理' where case_type='24_02-25';
+update "dyh_case_info" set case_type_first = '24_01-1' ,case_type_first_name='市场监管' where case_type='24_02-5';
+update "dyh_case_info" set case_type_first = '24_01-2' ,case_type_first_name='劳动社保' where case_type='24_02-9';
--
Gitblit v1.8.0