Skip to content

Y
yichengstreet-be
Commit 0bd26728 authored by lixuan's avatar lixuan
Browse files
Options

Merge branch 'dev-lx' into dev 

# Conflicts:
#	ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
parents 1ad25ad4 6f6b6e56
Pipeline #144871 failed with stages
      in 45 minutes and 43 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 45 additions and 46 deletions
      ruoyi-system/src/main/java/com/ruoyi/system/domain/house/HouseResource.java
      View file @ 0bd26728
      ......@@ -77,4 +77,6 @@ public class HouseResource implements Serializable {
      private String lat;
      private String remark;
      private Integer showFlag;
      }
      ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
      View file @ 0bd26728
      ......@@ -37,6 +37,7 @@
      <result property="lon" column="lon" jdbcType="VARCHAR"/>
      <result property="lat" column="lat" jdbcType="VARCHAR"/>
      <result property="remark" column="remark" jdbcType="VARCHAR"/>
      <result property="showFlag" column="show_flag" jdbcType="INTEGER"/>
      </resultMap>
      <insert id="insertHouseResource" parameterType="com.ruoyi.system.domain.house.HouseResource">
      ......@@ -134,52 +135,48 @@
      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_sell t4 ON t4.business_entity_info_id = t3.id
      where t1.rental_unit = 5
      <if test="query.wgType != null">
      and t1.type = #{query.wgType}
      </if>
      <if test="query.two != null and query.two != ''">
      and t1.two = #{query.two}
      </if>
      <if test="query.three != null and query.three != ''">
      and t1.three = #{query.three}
      </if>
      <if test="query.four != null and query.four != ''">
      and t1.four = #{query.four}
      </if>
      <if test="query.houseResourceAttribute != null">
      and t1.house_resource_attribute = #{query.houseResourceAttribute}
      </if>
      <if test="query.hireStatus != null">
      and t1.hire_status = #{query.hireStatus}
      </if>
      <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>
      <if test="query.houseResourceType != null">
      and t1.house_resource_type = #{query.houseResourceType}
      </if>
      <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>
      <if test="query.yearTaxMin != null and query.yearTaxMin != '' and query.yearTaxMax != null and query.yearTaxMax != ''">
      and t4.year_tax <![CDATA[ >= ]]> #{query.yearTaxMin} and t4.year_tax <![CDATA[ <= ]]> #{query.yearTaxMax}
      </if>
      <if test="query.unitPriceMin != null and query.unitPriceMin != '' and query.unitPriceMax != null and query.unitPriceMax != ''">
      and t1.unit_price <![CDATA[ >= ]]> #{query.unitPriceMin} and t1.unit_price <![CDATA[ <= ]]> #{query.unitPriceMax}
      </if>
      <if test="query.wgCodes != null and query.wgCodes.size() > 0">
      and t1.two in
      <foreach item="item" index="index" collection="query.wgCodes" open="(" separator="," close=")">
      #{item}
      </foreach>
      </if>
      <where>
      and t1.show_flag = 1
      <if test="query.wgType != null">
      and t1.type = #{query.wgType}
      </if>
      <if test="query.two != null and query.two != ''">
      and t1.two = #{query.two}
      </if>
      <if test="query.three != null and query.three != ''">
      and t1.three = #{query.three}
      </if>
      <if test="query.four != null and query.four != ''">
      and t1.four = #{query.four}
      </if>
      <if test="query.houseResourceAttribute != null">
      and t1.house_resource_attribute = #{query.houseResourceAttribute}
      </if>
      <if test="query.hireStatus != null">
      and t1.hire_status = #{query.hireStatus}
      </if>
      <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>
      <if test="query.houseResourceType != null">
      and t1.house_resource_type = #{query.houseResourceType}
      </if>
      <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>
      <if test="query.wgCodes != null and query.wgCodes.size() > 0">
      and t1.two in
      <foreach item="item" index="index" collection="query.wgCodes" open="(" separator="," close=")">
      #{item}
      </foreach>
      </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}
      ......
      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