Merge remote-tracking branch 'origin/master'

guoshilong

2023-11-03 fb798e4982a392408b3e8324c69baba0824fe3fd

 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml

@@ -22,10 +22,32 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>

    <resultMap id="houseRentalTenant" type="org.springblade.modules.house.vo.HouseRentalVO"
               autoMapping="true">
        <id property="id" column="id"/>
        <collection property="houseTenantVOList" javaType="java.util.List"
                    ofType="org.springblade.modules.house.vo.HouseTenantVO" autoMapping="true">
            <id property="id" column="tenantId"/>
        </collection>
    </resultMap>


    <select id="selectHouseRentalPage" resultMap="houseRentalResultMap">
        select * from jczz_house_rental where is_deleted = 0
    </select>

    <!--查询房屋出租情况-->
    <select id="getHouseRentalListByCode" resultMap="houseRentalTenant">
        select
            jhr.*,
            if(termination_time is null,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1),2) as status,
            jht.id as tenantId,jht.*
        from jczz_house_rental jhr
        left join jczz_house_tenant jht on jhr.id = jht.housing_rental_id and jht.is_deleted = 0
        where 1 = 1
        and jhr.is_deleted = 0
        and house_code = #{code}
    </select>


</mapper>