From c04ff3bd8f90d2cd8ea743201354d2cc4ceef5e0 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 08 Jan 2024 17:09:47 +0800
Subject: [PATCH] 物业商户配置，物业缴费项、物业缴费记录
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 0276218..822e339 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -168,6 +168,7 @@
jda.nei_name AS neiName,
jg.grid_name,
jhs.building,
+ jhs.district_code aoiCode,
jhs.unit
FROM
jczz_household jh
@@ -274,7 +275,8 @@
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
- <where>
+ where jh.is_deleted = 0
+ and jh.name != '' and jh.name is not null
<if test="household.userId!=null">
AND jg.id IN ( SELECT DISTINCT jgm.grid_id FROM jczz_gridman jgm WHERE jgm.user_id = #{household.userId}
)
@@ -315,9 +317,7 @@
<if test="household.id!=null and household.id!=''">
and jh.id = #{household.id}
</if>
- and jh.is_deleted = 0
order by jh.create_time desc
- </where>
</select>
@@ -355,7 +355,7 @@
left join jczz_user_house_label jhl on jh.id = jhl.household_id
where 1=1 and jh.is_deleted = 0
and jh.house_code = #{code}
- order by jh.relationship asc,jh.id desc
+ order by -jh.relationship desc,jh.id desc
</select>
<!--查询房屋集合信息-按id-->
@@ -698,7 +698,7 @@
<if test="household.regionCode!=null and household.regionCode!=''">
and jg.community_code like concat('%',#{household.regionCode},'%')
</if>
- <if test="household.id!=null and household.id!=''">
+ <if test="household.id!=null">
and jh.id = #{household.id}
</if>
<if test="household.labelId!=null">
@@ -708,7 +708,10 @@
and CONCAT(jh.name,jh.phone_number) like CONCAT ('%', #{household.searchKey},'%')
</if>
and jh.is_deleted = 0
- order by jh.create_time desc
+ order by jh.create_time desc,jh.id desc
+ <if test="household.limit!=null">
+ limit #{household.limit}
+ </if>
</where>
</select>
--
Gitblit v1.9.3