From 88ea54cb6460f1ff3c762c9f477f89329f5c5986 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Fri, 25 Oct 2024 16:12:46 +0800
Subject: [PATCH] fix:解纷态势-根据最新原型设计重新计算本级数量
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml | 71 +++++++++++++++++++----
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 68 +++++++++++++++++-----
2 files changed, 109 insertions(+), 30 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
index 97be16f..2cd8bc4 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
@@ -358,16 +358,59 @@
and (DATE_FORMAT(b.file_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.fileStart}
and DATE_FORMAT(b.file_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{terms.fileEnd})
</if>
- <if test="terms.queCity != null and terms.queCity !='' and terms.statistics != null">
- and ((b.mediate_unit_id is not null and c.city = #{terms.queCity})
- or (b.mediate_unit_id is null and a.que_city = #{terms.queCity}))
+ <if test='terms.queCity != null and terms.queCity !="" and terms.statistics != null and terms.areaType == "1"'>
+ and (b.mediate_unit_id is not null and c.city = #{terms.queCity}
+ <if test="terms.unitGrades != null and terms.unitGrades.size > 0">
+ and c.unit_grade in
+ <foreach collection="terms.unitGrades" item="unitGrade" index="index" open="(" separator="," close=")">
+ #{unitGrade}
+ </foreach>
+ </if>
+ )
</if>
- <if test="terms.queArea != null and terms.queArea !='' and terms.statistics != null">
- and ((b.mediate_unit_id is not null and c.area = #{terms.queArea})
- or (b.mediate_unit_id is null and a.que_area = #{terms.queArea}))
+ <if test='terms.queCity != null and terms.queCity !="" and terms.statistics != null and terms.areaType != "1"'>
+ and ((b.mediate_unit_id is not null and c.city = #{terms.queCity}
+ <if test="terms.unitGrades != null and terms.unitGrades.size > 0">
+ and c.unit_grade in
+ <foreach collection="terms.unitGrades" item="unitGrade" index="index" open="(" separator=","
+ close=")">
+ #{unitGrade}
+ </foreach>
+ </if>)
+ or (b.mediate_unit_id is null and a.que_city = #{terms.queCity})
+ )
+ </if>
+ <if test='terms.queArea != null and terms.queArea !="" and terms.statistics != null and terms.areaType == "2"'>
+ and (b.mediate_unit_id is not null and c.area = #{terms.queArea}
+ <if test="terms.unitGrades != null and terms.unitGrades.size > 0">
+ and c.unit_grade in
+ <foreach collection="terms.unitGrades" item="unitGrade" index="index" open="(" separator="," close=")">
+ #{unitGrade}
+ </foreach>
+ </if>
+ )
+ </if>
+ <if test='terms.queArea != null and terms.queArea !="" and terms.statistics != null and terms.areaType != "2"'>
+ and ((b.mediate_unit_id is not null and c.area = #{terms.queArea}
+ <if test="terms.unitGrades != null and terms.unitGrades.size > 0">
+ and c.unit_grade in
+ <foreach collection="terms.unitGrades" item="unitGrade" index="index" open="(" separator="," close=")">
+ #{unitGrade}
+ </foreach>
+ </if>
+ )
+ or (b.mediate_unit_id is null and a.que_area = #{terms.queArea})
+ )
</if>
<if test="terms.queRoad != null and terms.queRoad !='' and terms.statistics != null">
- and ((b.mediate_unit_id is not null and c.road = #{terms.queRoad})
+ and ((b.mediate_unit_id is not null and c.road = #{terms.queRoad}
+ <if test="terms.unitGrades != null and terms.unitGrades.size > 0">
+ and c.unit_grade in
+ <foreach collection="terms.unitGrades" item="unitGrade" index="index" open="(" separator="," close=")">
+ #{unitGrade}
+ </foreach>
+ </if>
+ )
or (b.mediate_unit_id is null and a.que_road = #{terms.queRoad}))
</if>
<if test="terms.isArea != null and terms.isArea !=''">
@@ -850,13 +893,16 @@
<!-- 统计分析（区域） -->
<select id="statisticsArea" resultType="cn.huge.module.cases.domain.dto.CaseStatisticsAreaDTO">
SELECT
- <if test="terms.areaType == null or terms.areaType ==''">
- IF(c.area is null,a.que_area,c.area) as areaCode,IF(c.area_name is null,a.que_area_name,c.area_name) as areaName,
- </if>
- <if test='terms.areaType != null and terms.areaType =="1"'>
- IF(c.area is null,a.que_area,c.area) as areaCode,IF(c.area_name is null,a.que_area_name,c.area_name) as areaName,
+ <if test='terms.areaType == null or terms.areaType =="1"'>
+ IF(c.area is null,a.que_city,c.city) as areaCode,IF(c.city_name is null,a.que_city_name,c.city_name) as areaName,
</if>
<if test='terms.areaType != null and terms.areaType =="2"'>
+ IF(c.area is null,a.que_area,c.area) as areaCode,IF(c.area_name is null,a.que_area_name,c.area_name) as areaName,
+ </if>
+ <if test='terms.areaType != null and terms.areaType =="3"'>
+ IF(c.road is null,a.que_road,c.road) as areaCode,IF(c.road_name is null,a.que_road_name,c.road_name) as areaName,
+ </if>
+ <if test='terms.areaType != null and terms.areaType =="4"'>
IF(c.road is null,a.que_road,c.road) as areaCode,IF(c.road_name is null,a.que_road_name,c.road_name) as areaName,
</if>
c.unit_grade as unitGrade,
@@ -871,7 +917,6 @@
LEFT JOIN dyh_ct_unit c ON b.mediate_unit_id = c.id
<include refid="where-part-all"/>
group by areaCode
-
</select>
<!-- 统计分析（基础） -->
<select id="statisticsBase" resultType="cn.huge.module.cases.domain.dto.CaseStatisticsBaseDTO">
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 e154e08..e64388e 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
@@ -1017,22 +1017,37 @@
}
//目前没有村居，所以区和街道进来都是按街道展示
- String areaType = null;//兼容白云数据
+ String areaType = null;
+ String childAreaType = null;
List<Integer> unitGrades = new ArrayList<>();
+ List<Integer> childUnitGrades = new ArrayList<>();
+ Boolean isLast = false;
if(ObjectUtils.isNotEmpty(terms.get("queRoad"))){
- terms.put("areaType","2");
- areaType = "2";
+ terms.remove("queArea");
+ terms.remove("queCity");
+ areaType = "3";
+ childAreaType = "4";
areaCode = terms.get("queRoad")+"";
unitGrades.add(3);
unitGrades.add(4);
+ childUnitGrades.add(3);
+ childUnitGrades.add(4);
+ isLast = true;
}else if(ObjectUtils.isNotEmpty(terms.get("queArea"))){
- terms.put("areaType","2");
+ terms.remove("queCity");
areaType = "2";
+ childAreaType = "3";
areaCode = terms.get("queArea")+"";
unitGrades.add(2);
+ childUnitGrades.add(3);
+ childUnitGrades.add(4);
}else{
areaType = "1";
+ childAreaType = "2";
unitGrades.add(1);
+ childUnitGrades.add(2);
+ childUnitGrades.add(3);
+ childUnitGrades.add(4);
areaCode = ctUnitDTO.getCity();
}
//基础数据统计
@@ -1047,28 +1062,47 @@
caseStatisticsBaseDTO.setTwoLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getTwoLevelNum() * 100, levelTotalNum, 1));
caseStatisticsBaseDTO.setThreeLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getThreeLevelNum() * 100, levelTotalNum, 1));
//区域数据统计
- List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS = mapper.statisticsArea(terms);
- if (ObjectUtils.isEmpty(caseStatisticsAreaDTOS)) {
- caseStatisticsAreaDTOS = new ArrayList<>();
+ List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS = new ArrayList<>();
+ if(!isLast){
+ terms.put("areaType",childAreaType);
+ terms.put("unitGrades",childUnitGrades);
+ caseStatisticsAreaDTOS = mapper.statisticsArea(terms);
+ if (ObjectUtils.isEmpty(caseStatisticsAreaDTOS)) {
+ caseStatisticsAreaDTOS = new ArrayList<>();
+ }
}
+
+ //本级区数据
+ terms.put("areaType",areaType);
+ terms.put("unitGrades",unitGrades);
+ List<CaseStatisticsAreaDTO> allAreas = mapper.statisticsArea(terms);
CaseStatisticsAreaDTO allArea = new CaseStatisticsAreaDTO();
+ if (ObjectUtils.isNotEmpty(allAreas)) {
+ allArea = allAreas.get(0);
+ }
+ terms.remove("unitGrades");
allArea.setAreaName("本级");
- allArea.setAreaCode("1");
+ allArea.setAreaCode("0");
List<String> areaCodeList = new ArrayList<>();
List<CaseStatisticsAreaDTO> areaList = new ArrayList<>();
List<String> areaNames = new ArrayList<>();//为兼容白云区数据
+ Integer areaTotal = allArea.getCaseNum();
for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
areaNames.add(caseStatisticsAreaDTO.getAreaName());
+ areaList.add(caseStatisticsAreaDTO);
+ areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
+ areaTotal = areaTotal + caseStatisticsAreaDTO.getCaseNum();
+
//本及：承办单位是本及和没有承办单位并且没有下级区域编码
- if(ObjectUtils.isEmpty(caseStatisticsAreaDTO.getAreaCode()) || unitGrades.contains(caseStatisticsAreaDTO.getUnitGrade())){
- allArea.setCaseNum(dellNull(caseStatisticsAreaDTO.getCaseNum()) + dellNull(allArea.getCaseNum()));
- allArea.setResolveNum(dellNull(caseStatisticsAreaDTO.getResolveNum()) + dellNull(allArea.getResolveNum()));
- allArea.setUnResolveNum(dellNull(caseStatisticsAreaDTO.getUnResolveNum()) + dellNull(allArea.getUnResolveNum()));
- allArea.setResolveingNum(dellNull(caseStatisticsAreaDTO.getResolveingNum()) + dellNull(allArea.getResolveingNum()));
- }else{
- areaList.add(caseStatisticsAreaDTO);
- areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
- }
+// if(ObjectUtils.isEmpty(caseStatisticsAreaDTO.getAreaCode()) || unitGrades.contains(caseStatisticsAreaDTO.getUnitGrade())){
+// allArea.setCaseNum(dellNull(caseStatisticsAreaDTO.getCaseNum()) + dellNull(allArea.getCaseNum()));
+// allArea.setResolveNum(dellNull(caseStatisticsAreaDTO.getResolveNum()) + dellNull(allArea.getResolveNum()));
+// allArea.setUnResolveNum(dellNull(caseStatisticsAreaDTO.getUnResolveNum()) + dellNull(allArea.getUnResolveNum()));
+// allArea.setResolveingNum(dellNull(caseStatisticsAreaDTO.getResolveingNum()) + dellNull(allArea.getResolveingNum()));
+// }else{
+// areaList.add(caseStatisticsAreaDTO);
+// areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
+// }
}
areaList.add(allArea);
if("1".equals(areaType)){
--
Gitblit v1.8.0