From 2a0dffbab1819596d08032eddb0f03d3725709bc Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 Nov 2023 18:35:02 +0800
Subject: [PATCH] 回滚代码
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 6 +-----
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 4 ++--
src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml | 19 +++++++++++--------
3 files changed, 14 insertions(+), 15 deletions(-)
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 52ca811..04b8187 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -67,11 +67,11 @@
<if test="task.isDeleted != null ">and jt.is_deleted = #{task.isDeleted}</if>
<if test="task.houseCode != null and task.houseCode != ''">and jt.house_code = #{task.houseCode}</if>
<!-- 取保候审 -->
- <if test="reportType != null and reportType == 1 ">
+ <if test="task.reportType != null and task.reportType == 1 ">
and jt.report_type = 1
</if>
<!-- 场所店铺 -->
- <if test="reportType != null and reportType == 2 ">
+ <if test="task.reportType != null and task.reportType == 2 ">
and jt.report_type in (2,3,4,5,6)
</if>
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 251ceff..c0d8502 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml
@@ -73,15 +73,18 @@
<select id="getStatistics" resultType="java.lang.Integer">
- SELECT count(1)
- FROM jczz_gridman jgm
- LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
- LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
- LEFT JOIN jczz_task_report_for_repairs jtr ON jgr.house_code = jtr.address_code
- LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtr.address_code
- WHERE jg.is_deleted = 0
+ SELECT
+ count(1)
+ FROM
+ jczz_gridman jgm
+ LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
+ LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_task_report_for_repairs jtr ON jgr.house_code = jtr.address_code
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jtr.address_code
+ WHERE
+ jg.is_deleted = 0
and jtr.confirm_flag = 1
- AND jtr.user_id = #{userId}
+ AND jgm.user_id = #{userId}
</select>
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 0185983..ba1e0fa 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -66,11 +66,7 @@
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
}
- // 没有范围，不查询数据
- if (list.size() > 0) {
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
- }
- return page.setRecords(new ArrayList<>());
+ return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
}
/**
--
Gitblit v1.9.3