From 1a47d5fe54230e312aa8486aad7fb30ada1f7b2b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 06 Dec 2023 09:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 6 +++---
1 files changed, 3 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 f4d75a3..43016bb 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -156,6 +156,7 @@
<!--导出数据-->
<select id="export" resultType="org.springblade.modules.house.excel.HouseHoldExcel">
select
+ jh.house_code houseCode,
jh.name,jh.phone_number phoneNumber,jh.role_type roleType,jh.relationship relationship,
jh.is_primary_contact isPrimaryContact,jh.residential_status residentialStatus,jh.gender,
jh.birthday,jh.id_card idCard,jh.hkmt_pass hkmtPass,jh.passport,jh.ethnicity,jh.education,
@@ -183,18 +184,17 @@
<select id="statistics" resultType="java.lang.Integer">
-
SELECT
count(1)
FROM
jczz_grid_range jgr
LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
LEFT JOIN jczz_household jh on jh.house_code=jgr.house_code
WHERE
jg.is_deleted = 0
and jh.confirm_flag = 0
- AND jg.user_id = #{userId}
-
+ AND jgm.user_id = #{userId}
</select>
<!--查询物业-->
--
Gitblit v1.9.3