From 2901ab60fac3b706fd7858374201087793dfde6c Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 06 Dec 2023 10:42:24 +0800
Subject: [PATCH] 租客表迁移到住户表
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..752192d 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -38,6 +38,7 @@
<result column="remark" property="remark"/>
<result column="is_deleted" property="isDeleted"/>
<result column="confirm_flag" property="confirmFlag"/>
+ <result column="housing_rental_id" property="housingRentalId"/>
</resultMap>
<sql id="selectHousehold">
@@ -74,7 +75,8 @@
update_time,
remark,
is_deleted,
- confirm_flag
+ confirm_flag,
+ housing_rental_id
from jczz_household
</sql>
@@ -156,6 +158,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 +186,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