Merge remote-tracking branch 'origin/master'

guoshilong

2023-11-03 f37e7e5c00cb8196ff978f8eac2aab3fe9465b0d

 src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java

@@ -25,13 +25,19 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.wrapper.DoorplateAddressWrapper;
import org.springblade.modules.house.vo.HouseParam;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

/*
 * 门牌地址表（总台账数据） 控制器
 *
@@ -121,7 +127,7 @@

   /**
    * 根据角色获取功能集合数据
    * @param type
    * @param type 1：查社区  2：查场所  3：查房屋
    * @param roleName
    * @return
    */
@@ -132,14 +138,12 @@

   /**
    * 获取楼盘相关集合数据
    * @param name 名称
    * @param code 编号
    * @param type 类型 1：社区  2：小区  3：楼栋  4：户室
    * @param houseParam
    * @return
    */
   @GetMapping("/getHousesList")
   public R getHousesList(String name,String code,Integer type) {
      return R.data(doorplateAddressService.getHousesList(name,code,type));
   public R getHousesList(HouseParam houseParam) {
      return R.data(doorplateAddressService.getHousesList(houseParam));
   }

   /**
@@ -152,5 +156,16 @@
      return R.data(doorplateAddressService.getHouseRentInfo(code));
   }

   /**
    * 获取门牌地址树集合信息
    * @param code
    * @param type
    * @return
    */
   @GetMapping("/getDoorplateAddressList")
   public R<List<DoorplateAddressVOTree>> getDoorplateAddressList(String code, String type){
      List<DoorplateAddressVOTree> list = doorplateAddressService.getDoorplateAddressList(code,type);
      return R.data(list);
   }

}