Commit 080ea81e authored by lixuan's avatar lixuan

feat: 房源

parent 1c4196f0
Pipeline #145431 failed with stages
......@@ -181,6 +181,12 @@
<if test="query.yearTaxMax != null and query.yearTaxMax != ''">
and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
</if>
<if test="query.unitPriceMin != null and query.unitPriceMin != ''">
and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin}
</if>
<if test="query.unitPriceMax != null and query.unitPriceMax != ''">
and t4.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
</if>
<if test="query.gsFlag != null and query.gsFlag != ''">
and t3.gs = ${query.gsFlag}
</if>
......@@ -230,18 +236,20 @@
</if>
</where>
GROUP BY t1.id
<if test="query.dayPriceMin != null and query.dayPriceMin != ''">
having dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
<trim prefix="having" prefixOverrides="and">
<if test="query.dayPriceMin != null and query.dayPriceMin != ''">
and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
</if>
<if test="query.dayPriceMax != null and query.dayPriceMax != ''">
and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
</if>
</if>
<if test="query.dayPriceMax != null and query.dayPriceMax != ''">
having dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
<if test="query.dayPriceMin != null and query.dayPriceMin != ''">
and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
<if test="query.yearSellMin != null and query.yearSellMin != ''">
and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
</if>
</if>
<if test="query.yearSellMax != null and query.yearSellMax != ''">
and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
</if>
</trim>
<if test="query.incomeSort != null and query.incomeSort != ''">
ORDER BY income ${query.incomeSort}
</if>
......@@ -283,7 +291,8 @@
t2.wg_name AS wgName4,
t1.*,
t4.year_sell,
t3.nature
t3.nature,
ROUND(IFNULL(t1.unit_price,0) * 10000 / 365 / t1.house_area, 1) AS dayPrice
FROM
house_resource t1
LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
......@@ -335,6 +344,12 @@
<if test="query.yearTaxMax != null and query.yearTaxMax != ''">
and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
</if>
<if test="query.unitPriceMin != null and query.unitPriceMin != ''">
and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin}
</if>
<if test="query.unitPriceMax != null and query.unitPriceMax != ''">
and t4.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
</if>
<if test="query.gsFlag != null and query.gsFlag != ''">
and t3.gs = ${query.gsFlag}
</if>
......@@ -426,7 +441,8 @@
t3.gs,
t1.remark,
t3.name AS businessEntityInfoName,
t3.principal
t3.principal,
ROUND(IFNULL(t1.unit_price,0) * 10000 / 365 / t1.house_area, 1) AS dayPrice
FROM
house_resource t1
LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
......@@ -478,6 +494,12 @@
<if test="query.yearTaxMax != null and query.yearTaxMax != ''">
and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
</if>
<if test="query.unitPriceMin != null and query.unitPriceMin != ''">
and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin}
</if>
<if test="query.unitPriceMax != null and query.unitPriceMax != ''">
and t4.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
</if>
<if test="query.gsFlag != null and query.gsFlag != ''">
and t3.gs = ${query.gsFlag}
</if>
......@@ -497,6 +519,20 @@
</foreach>
</if>
</where>
<trim prefix="having" prefixOverrides="and">
<if test="query.dayPriceMin != null and query.dayPriceMin != ''">
and dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
</if>
<if test="query.dayPriceMax != null and query.dayPriceMax != ''">
and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
</if>
<if test="query.yearSellMin != null and query.yearSellMin != ''">
and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin}
</if>
<if test="query.yearSellMax != null and query.yearSellMax != ''">
and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
</if>
</trim>
</select>
<select id="selectAll" resultType="com.ruoyi.system.domain.house.HouseResource">
SELECT * FROM house_resource
......
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