From db7e077ea8f2d995e922bc11b77dc149592a7455 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 09 四月 2025 12:35:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
index 39b0c9c..f6a5a13 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
@@ -55,7 +55,7 @@
<if test="req.leaseStatus == 1">
and (t2.start_time is null) and t1.lease_status = 1
</if>
- <if test="req.businessDeptId != null and req.businessDeptId != '' and req.businessDeptId!='0'">
+ <if test="req.businessDeptId != null and req.businessDeptId != '' and req.businessDeptId!=0">
and t1.business_dept_id = #{req.businessDeptId}
</if>
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
@@ -86,5 +86,16 @@
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</select>
+ <select id="getRentedArea" resultType="java.lang.Double">
+ SELECT COALESCE(SUM(t1.house_area),0) FROM t_house t1
+ LEFT JOIN t_contract t2 ON t1.id = t2.house_id AND t2.status = 4 AND t2.pay_type = 2
+ <where>
+ t1.lease_status != 1
+ <if test="businessDeptId!=0">
+ AND t1.business_dept_id = #{businessDeptId}
+ </if>
+ AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ </select>
</mapper>
--
Gitblit v1.7.1