Skip to content

Y
yichengstreet-be
Commit 7e56768e authored by lixuan's avatar lixuan
Browse files
Options

feat: 房源

parent be955aca
Pipeline #145409 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 43 additions and 21 deletions
      ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
      View file @ 7e56768e
      ......@@ -157,8 +157,11 @@
      <if test="query.houseNumber != null and query.houseNumber != ''">
      and t1.house_number like concat('%', #{query.houseNumber}, '%')
      </if>
      <if test="query.houseAreaMin != null and query.houseAreaMin != '' and query.houseAreaMax != null and query.houseAreaMax != ''">
      and t1.house_area <![CDATA[ >= ]]> #{query.houseAreaMin} and t1.house_area <![CDATA[ <= ]]> #{query.houseAreaMax}
      <if test="query.houseAreaMin != null and query.houseAreaMin != ''">
      and t1.house_area <![CDATA[ >= ]]> #{query.houseAreaMin}
      </if>
      <if test="query.houseAreaMax != null and query.houseAreaMax != ''">
      and t1.house_area <![CDATA[ <= ]]> #{query.houseAreaMax}
      </if>
      <if test="query.houseResourceType != null">
      and t1.house_resource_type = #{query.houseResourceType}
      ......@@ -166,8 +169,11 @@
      <if test="query.name != null and query.name != ''">
      and t3.name like concat('%', #{query.name}, '%')
      </if>
      <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
      and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
      <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>
      <if test="query.gsFlag != null and query.gsFlag != ''">
      and t3.gs = ${query.gsFlag}
      ......@@ -218,8 +224,17 @@
      </if>
      </where>
      GROUP BY t1.id
      <if test="query.dayPriceMin != null and query.dayPriceMin != '' and query.dayPriceMax != null and query.dayPriceMax != ''">
      having dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin} and dayPrice <![CDATA[ <= ]]> #{query.dayPriceMax}
      <if test="query.dayPriceMin != null and query.dayPriceMin != ''">
      having dayPrice <![CDATA[ >= ]]> #{query.dayPriceMin}
      <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>
      </if>
      <if test="query.incomeSort != null and query.incomeSort != ''">
      ORDER BY income ${query.incomeSort}
      ......@@ -261,7 +276,8 @@
      SELECT
      t2.wg_name AS wgName4,
      t1.*,
      t4.year_sell
      t4.year_sell,
      t3.nature
      FROM
      house_resource t1
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four
      ......@@ -324,11 +340,17 @@
      </where>
      GROUP BY t1.id
      <trim prefix="having" prefixOverrides="and">
      <if test="query.houseAreaMin != null and query.houseAreaMin != '' and query.houseAreaMax != null and query.houseAreaMax != ''">
      and t1.house_area <![CDATA[ >= ]]> #{query.houseAreaMin} and t1.house_area <![CDATA[ <= ]]> #{query.houseAreaMax}
      <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 query.yearSellMax != null and query.yearSellMax != ''">
      and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
      <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>
      ......@@ -386,8 +408,11 @@
      <if test="query.houseNumber != null and query.houseNumber != ''">
      and t1.house_number like concat('%', #{query.houseNumber}, '%')
      </if>
      <if test="query.houseAreaMin != null and query.houseAreaMin != '' and query.houseAreaMax != null and query.houseAreaMax != ''">
      and t1.house_area <![CDATA[ >= ]]> #{query.houseAreaMin} and t1.house_area <![CDATA[ <= ]]> #{query.houseAreaMax}
      <if test="query.houseAreaMin != null and query.houseAreaMin != ''">
      and t1.house_area <![CDATA[ >= ]]> #{query.houseAreaMin}
      </if>
      <if test="query.houseAreaMax != null and query.houseAreaMax != ''">
      and t1.house_area <![CDATA[ <= ]]> #{query.houseAreaMax}
      </if>
      <if test="query.houseResourceType != null">
      and t1.house_resource_type = #{query.houseResourceType}
      ......@@ -395,8 +420,11 @@
      <if test="query.name != null and query.name != ''">
      and t3.name like concat('%', #{query.name}, '%')
      </if>
      <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
      and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
      <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>
      <if test="query.gsFlag != null and query.gsFlag != ''">
      and t3.gs = ${query.gsFlag}
      ......@@ -416,12 +444,6 @@
      #{item}
      </foreach>
      </if>
      <if test="query.houseAreaMin != null and query.houseAreaMin != '' and query.houseAreaMax != null and query.houseAreaMax != ''">
      and t1.house_area <![CDATA[ >= ]]> #{query.houseAreaMin} and t1.house_area <![CDATA[ <= ]]> #{query.houseAreaMax}
      </if>
      <if test="query.yearSellMin != null and query.yearSellMin != '' and query.yearSellMax != null and query.yearSellMax != ''">
      and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
      </if>
      </where>
      </select>
      <select id="selectAll" resultType="com.ruoyi.system.domain.house.HouseResource">
      ......
      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