From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
index d632397..2112ee4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -21,8 +21,8 @@
LEFT JOIN jczz_house jh on jh.house_code=jtrpa.house_code
left join jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
left join blade_region br on br.code = jg.community_code
- where jtrpa.is_deleted = 0
<where>
+ and jtrpa.is_deleted = 0
<if test="residen.id != null ">and id = #{residen.id}</if>
<if test="residen.name != null and residen.name != ''">and name = #{residen.name}</if>
<if test="residen.phone != null and residen.phone != ''">and phone = #{residen.phone}</if>
@@ -88,10 +88,19 @@
</if>
</if>
- and is_deleted = 0
</where>
</select>
+
+ <select id="getCount" resultType="java.lang.Integer">
+ SELECT count(1)
+ FROM jczz_task_residence_permit_apply jtrpa
+ WHERE jtrpa.jw_grid_code IN
+ (SELECT jpag.jw_grid_code FROM jczz_police_affairs_grid jpag WHERE jpag.police_user_id like concat('%',${userId},'%') )
+ AND jtrpa.`confirm_flag` = 1
+
+ </select>
+
<resultMap type="org.springblade.modules.task.dto.TaskResidencePermitApplyDTO"
id="TaskResidencePermitApplyDTOResult">
<result property="id" column="id"/>
--
Gitblit v1.9.3