From 440a38bf126ccc8b19352ee6f89ef3141775ec63 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 11 Apr 2024 13:54:04 +0800
Subject: [PATCH] 报事报修+消防自查+二手校验 添加housecode 查询
---
src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml | 1 +
src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml | 5 +++++
src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java | 2 ++
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 4 ++++
4 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
index 57dd84f..51bc0ad 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskLabelReportingEventMapper.xml
@@ -58,6 +58,11 @@
<if test="taskLabelReportingEvent.userId != null and taskLabelReportingEvent.userId != ''">
AND jtlre.user_id = #{taskLabelReportingEvent.userId}
</if>
+
+ <if test="taskLabelReportingEvent.houseCode != null and taskLabelReportingEvent.houseCode != ''">
+ and jp.house_code = #{taskLabelReportingEvent.houseCode}
+ </if>
+
<if test="taskLabelReportingEvent.eventType != null and taskLabelReportingEvent.eventType != ''">
AND jtlre.event_type = #{taskLabelReportingEvent.eventType}
</if>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
index 5e40ce1..e5d7ce9 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
@@ -210,6 +210,7 @@
jp.location,
jg.grid_name,
jp.principal,
+ jp.no_explosion_category,
jp.principal_phone,
br.town_name,
br.village_name,
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
index ab0c9fc..2920127 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -171,6 +171,10 @@
AND jtrfr.create_user = #{vo.createUser}
</if>
+ <if test="vo.houseCode != null and vo.houseCode != ''">
+ and jtrfr.address_code = #{vo.houseCode}
+ </if>
+
<if test="vo.streetName != null and vo.streetName != ''">
AND br.town_name like concat('%',#{vo.streetName},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java b/src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java
index 031b765..5da38e7 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskLabelReportingEventVO.java
@@ -86,4 +86,6 @@
*/
private String communityCode;
+ private String houseCode;
+
}
--
Gitblit v1.9.3