From faf2e895f475d41a70a6e54cfadae61199dcbe12 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 02 Feb 2024 15:00:38 +0800
Subject: [PATCH] 隐患场所统计
---
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java | 2 +-
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
index b0771c1..f03686b 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.java
@@ -63,5 +63,5 @@
@Param("regionChildCodesList") List<String> regionChildCodesList,
@Param("isAdministrator") Integer isAdministrator);
- List<Map<String, Object>> getNineTypeStatistics(List<String> regionChildCodesList, Integer isAdministrator);
+ List<Map<String, Object>> getNineTypeStatistics(String code, List<String> regionChildCodesList, Integer isAdministrator);
}
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
index fdbb940..d5a710f 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -285,6 +285,7 @@
jczz_task jt
LEFT JOIN jczz_place jp ON jt.house_code = jp.house_code
LEFT JOIN jczz_grid jg ON jg.grid_code = jp.grid_code
+ LEFT JOIN blade_region br on br.`code`=jg.community_code
<where>
<if test="isAdministrator==2">
<choose>
@@ -297,6 +298,7 @@
</choose>
</if>
and jp.nine_type = bd.dict_key
+ and br.town_code =#{code}
</where>
) number
FROM
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java b/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
index 9f4077d..a406943 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -137,7 +137,7 @@
.eq(Region::getRegionLevel, 4));
List<RegionVO> copy = BeanUtil.copy(list, RegionVO.class);
for (RegionVO regionVO : copy) {
- List<Map<String, Object>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionChildCodesList, isAdministrator);
+ List<Map<String, Object>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionVO.getCode(),regionChildCodesList, isAdministrator);
regionVO.setNineTypeStatistics(nineTypeStatistics);
}
return copy;
--
Gitblit v1.9.3