Skip to content

Y
yichengstreet-be
Commit 685d2c56 authored by lixuan's avatar lixuan
Browse files
Options

Merge branch 'dev' into 'main' 

Dev

See merge request !125
parents 7f0d2579 f852d89b
Pipeline #143231 passed with stages
      in 9 minutes and 23 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 6 additions and 14 deletions
      ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java
      View file @ 685d2c56
      ...@@ -163,19 +163,11 @@ public class HouseResourceServiceImpl implements HouseResourceService { ...@@ -163,19 +163,11 @@ public class HouseResourceServiceImpl implements HouseResourceService {
      private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list) { private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list) {
      list.forEach(x -> { list.forEach(x -> {
      GridRegionExample gridRegionExample = new GridRegionExample(); GridRegion two = gridRegionMapper.selectByPrimaryKey(x.getTwo());
      gridRegionExample.createCriteria().andWgCodeEqualTo(x.getTwo()).andWgTypeEqualTo(String.valueOf(x.getType())); x.setWgName2(two.getWgName());
      List<GridRegion> two = gridRegionMapper.selectByExample(gridRegionExample);
      if (!two.isEmpty()) {
      x.setWgName2(two.get(0).getWgName());
      }
      GridRegionExample gridRegionExampleThree = new GridRegionExample(); GridRegion three = gridRegionMapper.selectByPrimaryKey(x.getThree());
      gridRegionExampleThree.createCriteria().andWgCodeEqualTo(x.getThree()).andWgTypeEqualTo(String.valueOf(x.getType())); x.setWgName3(three.getWgName());
      List<GridRegion> three = gridRegionMapper.selectByExample(gridRegionExampleThree);
      if (!three.isEmpty()) {
      x.setWgName3(three.get(0).getWgName());
      }
      x.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(x.getHouseResourceAttribute())); x.setHouseResourceAttributeText(HouseEnums.HouseResourceAttributeEnum.getDescByCode(x.getHouseResourceAttribute()));
      x.setHouseResourceTypeText(HouseEnums.HouseResourceTypeEnum.getDescByCode(x.getHouseResourceType())); x.setHouseResourceTypeText(HouseEnums.HouseResourceTypeEnum.getDescByCode(x.getHouseResourceType()));
      x.setOrientationText(HouseEnums.OrientationEnum.getDescByCode(x.getOrientation())); x.setOrientationText(HouseEnums.OrientationEnum.getDescByCode(x.getOrientation()));
      ......
      ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml
      View file @ 685d2c56
      ...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
      t2.* t2.*
      FROM FROM
      grid_region t1 grid_region t1
      LEFT JOIN house_resource t2 ON t1.wg_code = t2.four LEFT JOIN house_resource t2 ON t1.id = t2.four
      <where> <where>
      <if test="query.wgType != null"> <if test="query.wgType != null">
      and t2.type = #{query.wgType} and t2.type = #{query.wgType}
      ...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
      t2.* t2.*
      FROM FROM
      grid_region t1 grid_region t1
      LEFT JOIN house_resource t2 ON t1.wg_code = t2.four LEFT JOIN house_resource t2 ON t1.id = t2.four
      <where> <where>
      <if test="query.wgType != null"> <if test="query.wgType != null">
      and t2.type = #{query.wgType} and t2.type = #{query.wgType}
      ......
      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