From 0d2617d3010c600e9986897b5ef98aebf4bf20ba Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 02 Feb 2024 17:26:46 +0800
Subject: [PATCH] 隐患场所统计
---
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
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 d5a710f..5bc0a26 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -177,7 +177,8 @@
br.village_name,
bu.`name`,
jpe.legal_tel,
- jpe.legal_person
+ jpe.legal_person,
+ jda.address_name
FROM
jczz_task_place_rectification jtpr
LEFT JOIN jczz_place jp ON jtpr.house_code = jp.house_code
@@ -186,6 +187,7 @@
LEFT JOIN jczz_place_ext jpe ON jpe.place_id = jp.id
LEFT JOIN blade_user bu ON bu.id = jtpr.create_user
LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
<where>
<if test="taskPalce.id != null ">and id = #{taskPalce.id}</if>
<if test="taskPalce.placeCheckId != null ">and place_check_id = #{taskPalce.placeCheckId}</if>
@@ -236,6 +238,9 @@
</when>
</choose>
</if>
+ and jtpr.create_time=(
+ SELECT MAX(create_time) FROM jczz_task_place_rectification where jtpr.house_code=house_code
+ )
</where>
</select>
@@ -280,12 +285,12 @@
bd.dict_value,
(
SELECT
- count( DISTINCT jp.house_code )
+ IFNULL(sum( jpc.hidden_danger_number ) ,0)
FROM
- jczz_task jt
- LEFT JOIN jczz_place jp ON jt.house_code = jp.house_code
+ jczz_place_check jpc
+ LEFT JOIN jczz_place jp ON jpc.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
+ left join blade_region br on br.code = jg.community_code
<where>
<if test="isAdministrator==2">
<choose>
@@ -299,6 +304,9 @@
</if>
and jp.nine_type = bd.dict_key
and br.town_code =#{code}
+ and jpc.create_time=(
+ SELECT MAX(create_time) FROM jczz_place_check where jpc.house_code=house_code
+ )
</where>
) number
FROM
@@ -307,7 +315,7 @@
bd.code = 'nineType'
AND bd.is_sealed = 0
AND bd.dict_key > 0
- order by bd.sort desc
+ order by bd.sort asc
</select>
--
Gitblit v1.9.3