Skip to content

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

feat: 需求

parent a33a8369
Pipeline #147219 failed with stages
      in 3 minutes and 15 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 24 additions and 24 deletions
      ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
      View file @ 7d213d86
      ...@@ -134,10 +134,10 @@ ...@@ -134,10 +134,10 @@
      t5.year t5.year
      FROM FROM
      house_resource t1 house_resource t1
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0 INNER JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
      LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0 INNER JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0
      LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0 INNER JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0
      LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0 INNER JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0
      <where> <where>
      t1.delete_flag = 0 t1.delete_flag = 0
      <if test="query.wgType != null"> <if test="query.wgType != null">
      ...@@ -327,10 +327,10 @@ ...@@ -327,10 +327,10 @@
      t4.id AS businessEntityInfoId t4.id AS businessEntityInfoId
      FROM FROM
      house_resource t1 house_resource t1
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0 INNER JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
      LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0 INNER JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0
      LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0 INNER JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0
      LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0 INNER JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0
      <where> <where>
      t1.delete_flag = 0 t1.delete_flag = 0
      <if test="query.wgType != null"> <if test="query.wgType != null">
      ...@@ -514,10 +514,10 @@ ...@@ -514,10 +514,10 @@
      t5.year t5.year
      FROM FROM
      house_resource t1 house_resource t1
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0 INNER JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
      LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0 INNER JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0
      LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0 INNER JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0
      LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0 INNER JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0
      <where> <where>
      t1.delete_flag = 0 t1.delete_flag = 0
      <if test="query.wgType != null"> <if test="query.wgType != null">
      ...@@ -730,10 +730,10 @@ ...@@ -730,10 +730,10 @@
      t1.business_license_url t1.business_license_url
      FROM FROM
      house_resource t1 house_resource t1
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0 INNER JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
      LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0 INNER JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0
      LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0 INNER JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0
      LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0 INNER JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0
      <where> <where>
      t1.delete_flag = 0 t1.delete_flag = 0
      <if test="query.wgType != null"> <if test="query.wgType != null">
      ...@@ -887,10 +887,10 @@ ...@@ -887,10 +887,10 @@
      SUM(t5.year_tax) AS taxCount SUM(t5.year_tax) AS taxCount
      FROM FROM
      house_resource t1 house_resource t1
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0 INNER JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
      LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0 INNER JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0
      LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0 INNER JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0
      LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0 INNER JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0
      WHERE t1.delete_flag = 0 WHERE t1.delete_flag = 0
      GROUP BY t1.id, t4.id GROUP BY t1.id, t4.id
      </select> </select>
      ...@@ -927,10 +927,10 @@ ...@@ -927,10 +927,10 @@
      t4.principal t4.principal
      FROM FROM
      house_resource t1 house_resource t1
      LEFT JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0 INNER JOIN grid_region t2 ON t2.wg_code = t1.four AND t1.delete_flag = 0
      LEFT JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0 INNER JOIN house_resource_business_entity_info_mapping t3 ON t3.house_resource_id = t1.id AND t3.delete_flag = 0
      LEFT JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0 INNER JOIN business_entity_info t4 ON t3.business_entity_info_id = t4.id AND t4.delete_flag = 0
      LEFT JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0 INNER JOIN business_entity_sell t5 ON t5.business_entity_info_id = t4.id AND t5.delete_flag = 0
      WHERE t1.delete_flag = 0 AND t1.two = #{two} AND t4.NAME = #{name} WHERE t1.delete_flag = 0 AND t1.two = #{two} AND t4.NAME = #{name}
      </select> </select>
      <select id="selectByIdList" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage"> <select id="selectByIdList" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
      ......
      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