From 68a9f0a33df16b5aa8c622b61fc5c6bc96e721d7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:28:37 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 1 +
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 26 +++++++++++++++++++++++++-
src/main/java/org/springblade/modules/task/vo/TaskVO.java | 9 +++++++--
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index aa9e97f..663d04a 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -168,6 +168,7 @@
jda.nei_name AS neiName,
jg.grid_name,
jhs.building,
+ jhs.district_code aoiCode,
jhs.unit
FROM
jczz_household jh
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 8c46635..fba15af 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -22,7 +22,13 @@
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
- IFNULL( jda.address_name, jp.location ) address_name,
+ IFNULL( jda.address_name, jp.location ) AS address_name,
+ jgr.district_code aoiCode,
+ jda.region_code,
+ jg.community_code neiCode,
+ jc.street_code streetCode,
+ bu.name realName,
+ bu.phone,
jt.id,
jt.NAME,
jt.type,
@@ -42,6 +48,10 @@
jczz_task jt
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
LEFT JOIN jczz_place jp ON jp.house_code = jt.house_code
+ LEFT JOIN blade_user bu on bu.id = jt.create_user
+ LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
+ LEFT JOIN jczz_community jc on jc.`code`= jg.community_code
<where>
<if test="task.userId != null and task.userId != ''">
AND jt.house_code IN (
@@ -62,6 +72,19 @@
<if test="task.status != null and task.status != null">
and jt.status = #{task.status}
</if>
+
+ <if test="task.aoiCode != null and task.aoiCode != null">
+ and jgr.district_code = #{task.aoiCode}
+ </if>
+
+ <if test="task.neiCode != null and task.neiCode != null">
+ and jg.community_code = #{task.neiCode}
+ </if>
+
+ <if test="task.streetCode != null and task.streetCode != null">
+ and jc.street_code = #{task.streetCode}
+ </if>
+
<if test="task.frequency != null and task.frequency != ''">
and jt.frequency = #{task.frequency}
</if>
@@ -94,6 +117,7 @@
and jt.report_type in (2,3,4,5,6)
</if>
and jt.is_deleted = 0
+ and jt.house_code is not null
order by jt.create_time desc
</where>
</select>
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskVO.java b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
index c9fb199..0747a56 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
@@ -17,10 +17,9 @@
package org.springblade.modules.task.vo;
import io.swagger.annotations.ApiModelProperty;
-import org.springblade.modules.task.entity.TaskEntity;
-import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.modules.task.entity.TaskEntity;
/**
* 任务表 视图实体类
@@ -46,6 +45,12 @@
private String communityCode;
private String neiCode;
+ private String aoiCode;
+ private String regionCode;
+ private String realName;
+ private String phone;
+ private String streetCode;
+ private String streetName;
@ApiModelProperty("开始时间")
private String startTime;
--
Gitblit v1.9.3