Commit 1c4196f0 authored by lixuan's avatar lixuan

feat: 房源

parent b7f83f11
Pipeline #145430 canceled with stages
...@@ -80,6 +80,6 @@ ...@@ -80,6 +80,6 @@
t1.house_resource_id = #{houseResourceId} t1.house_resource_id = #{houseResourceId}
</select> </select>
<select id="selectByName" resultType="com.ruoyi.system.domain.house.BusinessEntityInfo"> <select id="selectByName" resultType="com.ruoyi.system.domain.house.BusinessEntityInfo">
SELECT * FROM business_entity_info WHERE name = #{name} SELECT t2.* FROM house_resource t1 LEFT JOIN business_entity_info t2 ON t1.id = t2.house_resource_id WHERE t2.name = #{name}
</select> </select>
</mapper> </mapper>
...@@ -175,6 +175,12 @@ ...@@ -175,6 +175,12 @@
<if test="query.yearSellMax != null and query.yearSellMax != ''"> <if test="query.yearSellMax != null and query.yearSellMax != ''">
and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
</if> </if>
<if test="query.yearTaxMin != null and query.yearTaxMin != ''">
and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
</if>
<if test="query.yearTaxMax != null and query.yearTaxMax != ''">
and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
</if>
<if test="query.gsFlag != null and query.gsFlag != ''"> <if test="query.gsFlag != null and query.gsFlag != ''">
and t3.gs = ${query.gsFlag} and t3.gs = ${query.gsFlag}
</if> </if>
...@@ -323,6 +329,12 @@ ...@@ -323,6 +329,12 @@
<if test="query.yearSellMax != null and query.yearSellMax != ''"> <if test="query.yearSellMax != null and query.yearSellMax != ''">
and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
</if> </if>
<if test="query.yearTaxMin != null and query.yearTaxMin != ''">
and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
</if>
<if test="query.yearTaxMax != null and query.yearTaxMax != ''">
and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
</if>
<if test="query.gsFlag != null and query.gsFlag != ''"> <if test="query.gsFlag != null and query.gsFlag != ''">
and t3.gs = ${query.gsFlag} and t3.gs = ${query.gsFlag}
</if> </if>
...@@ -419,6 +431,7 @@ ...@@ -419,6 +431,7 @@
house_resource t1 house_resource t1
LEFT JOIN grid_region t2 ON t2.wg_code = t1.four LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id LEFT JOIN business_entity_info t3 ON t1.id = t3.house_resource_id
LEFT JOIN business_entity_sell t4 ON t4.business_entity_info_id = t3.id
<where> <where>
<if test="query.wgType != null"> <if test="query.wgType != null">
and t1.type = #{query.wgType} and t1.type = #{query.wgType}
...@@ -459,6 +472,12 @@ ...@@ -459,6 +472,12 @@
<if test="query.yearSellMax != null and query.yearSellMax != ''"> <if test="query.yearSellMax != null and query.yearSellMax != ''">
and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
</if> </if>
<if test="query.yearTaxMin != null and query.yearTaxMin != ''">
and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin}
</if>
<if test="query.yearTaxMax != null and query.yearTaxMax != ''">
and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
</if>
<if test="query.gsFlag != null and query.gsFlag != ''"> <if test="query.gsFlag != null and query.gsFlag != ''">
and t3.gs = ${query.gsFlag} and t3.gs = ${query.gsFlag}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment