From a9b22868868d2ef45d6c50a7c77296c6a16d61d3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 02 Feb 2024 14:35:58 +0800
Subject: [PATCH] 消防整改
---
src/main/java/org/springblade/modules/system/vo/RegionVO.java | 2 +-
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 | 5 ++++-
src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java | 2 +-
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/vo/RegionVO.java b/src/main/java/org/springblade/modules/system/vo/RegionVO.java
index f84556d..fec1deb 100644
--- a/src/main/java/org/springblade/modules/system/vo/RegionVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/RegionVO.java
@@ -90,5 +90,5 @@
private String regionCode;
- private List<Map<String, Integer>> nineTypeStatistics;
+ private List<Map<String, Object>> nineTypeStatistics;
}
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java b/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
index 6d56362..7645231 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/controller/TaskPlaceRectificationController.java
@@ -175,7 +175,7 @@
/**
* 民警审核
*/
- @PostMapping("/rectificationStatistics")
+ @GetMapping("/rectificationStatistics")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "九小场所类型隐患数量统计", notes = "传入taskPlaceRectification")
public R rectificationStatistics() {
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 e0a2612..b0771c1 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, Integer>> getNineTypeStatistics(List<String> regionChildCodesList, Integer isAdministrator);
+ List<Map<String, Object>> getNineTypeStatistics(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 c13cb05..b58a51a 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -129,9 +129,11 @@
br.village_name,
bu.`name`,
jpe.legal_tel,
- jpe.legal_person
+ jpe.legal_person,
+ jt.remark reasonFailure
FROM
jczz_task_place_rectification jtpr
+ LEFT JOIN jczz_task jt on jt.id = jtpr.task_id
LEFT JOIN jczz_place jp ON jtpr.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
@@ -302,6 +304,7 @@
bd.code = 'nineType'
AND bd.is_sealed = 0
AND bd.dict_key > 0
+ order by bd.sort desc
</select>
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 1ca5cf3..9f4077d 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, Integer>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionChildCodesList, isAdministrator);
+ List<Map<String, Object>> nineTypeStatistics = baseMapper.getNineTypeStatistics(regionChildCodesList, isAdministrator);
regionVO.setNineTypeStatistics(nineTypeStatistics);
}
return copy;
--
Gitblit v1.9.3