From 966b0612d43aaf40acb958e720f6d79fe880c7fd Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jan 2024 13:49:12 +0800
Subject: [PATCH] 查询详情 bug 修复
---
src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml | 23 +++++++++++------------
src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java | 7 ++++++-
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
index 468ce5d..3c2cc94 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
@@ -68,11 +68,11 @@
<select id="getGridStatistics" resultType="java.lang.Integer">
SELECT count(1) number
FROM jczz_gridman jgm
- LEFT JOIN jczz_grid jg ON jg.id = jgm.grid_id
+ LEFT JOIN jczz_grid jg ON jg.id = jgm.grid_id
WHERE jg.community_code = #{code}
AND jg.is_deleted = 0
<if test="userId!=null and roleType == '1'">
- and jgm.user_id= #{userId}
+ and jgm.user_id= #{userId}
</if>
</select>
@@ -149,15 +149,14 @@
</select>
<select id="getGridManByCode" resultType="org.springblade.modules.system.entity.User">
-
- SELECT
- *
- FROM
- blade_user bu
- LEFT JOIN jczz_gridman jgm ON bu.id = jgm.user_id
- LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
- LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
- WHERE
- jgr.house_code = #{houseCode} and bu.is_deleted = 0
+SELECT
+ *
+FROM
+ blade_user bu
+ LEFT JOIN jczz_gridman jgm ON bu.id = jgm.user_id
+ LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
+WHERE
+ jg.community_code IN ( SELECT jg.community_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id WHERE jgr.house_code = #{houseCode} )
+ AND bu.is_deleted = 0
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
index ba0ca24..d057131 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskBailReportingEventServiceImpl.java
@@ -52,7 +52,12 @@
@Override
public Boolean saveBailReporting(TaskBailReportingEventDTO bailReporting) {
- Long aLong = taskService.saveTask(3, DictConstant.BAIL_PENDING_TRIAL, 1, "", AuthUtil.getUserId(), bailReporting.getHouseCode(), bailReporting.getReportType());
+ Long aLong = taskService.saveTask(3,
+ DictConstant.BAIL_PENDING_TRIAL,
+ 1, bailReporting.getApplyName(),
+ AuthUtil.getUserId(),
+ bailReporting.getHouseCode(),
+ bailReporting.getReportType());
if (aLong > 0) {
bailReporting.setTaskId(aLong);
bailReporting.setCheckUserId(AuthUtil.getUserId());
--
Gitblit v1.9.3