housing_estate_id

air/src/main/java/com/air/controller/AnnoBlocksSecondRelController.java

@@ -43,13 +43,13 @@ public class AnnoBlocksSecondRelController {
     /**
      * 通过id查询地块（公告）-楼盘副关联关系，主关联键已经写入楼盘业务表了，只有出现一对多的情况，即一个楼盘，跨越多个地块修建，才用这个
      *
-     * @param housingEstatesId id
+     * @param housingEstateId id
      * @return R
      */
     @ApiOperation(value = "通过id查询", notes = "通过id查询")
-    @GetMapping("/{housingEstatesId}")
+    @GetMapping("/{housingEstateId}")
-    public R getById(@PathVariable("housingEstatesId") Long housingEstatesId) {
+    public R getById(@PathVariable("housingEstateId") Long housingEstateId) {
-        return R.ok(annoBlocksSecondRelService.getById(housingEstatesId));
+        return R.ok(annoBlocksSecondRelService.getById(housingEstateId));
     }
 
     /**
@@ -81,13 +81,13 @@ public class AnnoBlocksSecondRelController {
     /**
      * 通过id删除地块（公告）-楼盘副关联关系，主关联键已经写入楼盘业务表了，只有出现一对多的情况，即一个楼盘，跨越多个地块修建，才用这个
      *
-     * @param housingEstatesId id
+     * @param housingEstateId id
      * @return R
      */
     @ApiOperation(value = "通过id删除地块（公告）-楼盘副关联关系，主关联键已经写入楼盘业务表了，只有出现一对多的情况，即一个楼盘，跨越多个地块修建，才用这个", notes = "通过id删除地块（公告）-楼盘副关联关系，主关联键已经写入楼盘业务表了，只有出现一对多的情况，即一个楼盘，跨越多个地块修建，才用这个")
-    @DeleteMapping("/{housingEstatesId}")
+    @DeleteMapping("/{housingEstateId}")
     @PreAuthorize("@pms.hasPermission('generator_annoblockssecondrel_del')")
-    public R removeById(@PathVariable Long housingEstatesId) {
+    public R removeById(@PathVariable Long housingEstateId) {
-        return R.ok(annoBlocksSecondRelService.removeById(housingEstatesId));
+        return R.ok(annoBlocksSecondRelService.removeById(housingEstateId));
     }
 }

air/src/main/java/com/air/entity/AnnoBlocksSecondRel.java

@@ -27,7 +27,7 @@ public class AnnoBlocksSecondRel extends Model<AnnoBlocksSecondRel> {
 
     @TableId
     @ApiModelProperty(value = "楼盘id")
-    private Long housingEstatesId;
+    private Long housingEstateId;
 
     @ApiModelProperty(value = "楼栋id")
     private Long blockId;

air/src/main/java/com/air/housing/controller/BlocksController.java

@@ -42,8 +42,8 @@ public class BlocksController {
 
     @ApiOperation(value = "根据楼盘id分页查询", notes = "根据楼盘id分页查询")
     @GetMapping("/page")
-    public R getBlocksPageByHousingEstatesId(Page page, BlockListDto blocks) {
+    public R getBlocksPageByhousingEstateId(Page page, BlockListDto blocks) {
-        return R.ok(blocksService.getBlocksPageByHousingEstatesId(page,blocks));
+        return R.ok(blocksService.getBlocksPageByhousingEstateId(page,blocks));
     }
     /**
      * 通过id查询楼栋信息

air/src/main/java/com/air/housing/controller/HousingEstatesController.java

@@ -60,13 +60,13 @@ public class HousingEstatesController {
     /**
      * 通过id查询楼盘（小区）
      *
-     * @param housingEstatesId id
+     * @param housingEstateId id
      * @return R
      */
     @ApiOperation(value = "通过id查询详情", notes = "通过id查询详情")
-    @GetMapping("/{housingEstatesId}")
+    @GetMapping("/{housingEstateId}")
-    public R getById(@PathVariable("housingEstatesId") Long housingEstatesId,Long blockId) {
+    public R getById(@PathVariable("housingEstateId") Long housingEstateId,Long blockId) {
-        HousingEstatesDetail housingEstates = housingEstatesService.getHousingEstatesDetail(housingEstatesId,blockId);
+        HousingEstatesDetail housingEstates = housingEstatesService.getHousingEstatesDetail(housingEstateId,blockId);
         return R.ok(housingEstates);
     }
 
@@ -98,12 +98,12 @@ public class HousingEstatesController {
     /**
      * 通过id删除楼盘（小区）
      *
-     * @param housingEstatesId id
+     * @param housingEstateId id
      * @return R
      */
     @ApiOperation(value = "通过id删除楼盘（小区）", notes = "通过id删除楼盘（小区）")
-    @DeleteMapping("/{housingEstatesId}")
+    @DeleteMapping("/{housingEstateId}")
-    public R removeById(@PathVariable Long housingEstatesId) {
+    public R removeById(@PathVariable Long housingEstateId) {
-        return R.ok(housingEstatesService.removeById(housingEstatesId));
+        return R.ok(housingEstatesService.removeById(housingEstateId));
     }
 }

air/src/main/java/com/air/housing/mapper/BlocksMapper.java

@@ -26,5 +26,5 @@ public interface BlocksMapper extends BaseMapper<Blocks> {
      * @param blockListDto
      * @return
      */
-    Page<Blocks> getBlocksPageByHousingEstatesId(Page page, @Param("Blocks")BlockListDto blockListDto);
+    Page<Blocks> getBlocksPageByhousingEstateId(Page page, @Param("Blocks")BlockListDto blockListDto);
 }

air/src/main/java/com/air/housing/service/BlocksService.java

@@ -18,6 +18,6 @@ public interface BlocksService extends IService<Blocks> {
      * @param blockListDto
      * @return
      */
-    Page<Blocks> getBlocksPageByHousingEstatesId(Page page,BlockListDto blockListDto);
+    Page<Blocks> getBlocksPageByhousingEstateId(Page page,BlockListDto blockListDto);
 
 }

air/src/main/java/com/air/housing/service/HousingEstatesService.java

@@ -38,11 +38,11 @@ public interface HousingEstatesService extends IService<HousingEstates> {
 
     /**
      * 根据楼盘id查询楼盘信息和相关的地块信息，如果楼栋个id不为空，再查询业态信息
-     * @param housingEstatesId
+     * @param housingEstateId
      * @param blockId
      * @return
      */
-    HousingEstatesDetail getHousingEstatesDetail(Long housingEstatesId,Long blockId);
+    HousingEstatesDetail getHousingEstatesDetail(Long housingEstateId,Long blockId);
 
     /**
      * 分页

air/src/main/java/com/air/housing/service/impl/BlocksServiceImpl.java

@@ -22,8 +22,8 @@ public class BlocksServiceImpl extends ServiceImpl<BlocksMapper, Blocks> impleme
     @Resource
     private BlocksMapper blocksMapper;
     @Override
-    public Page<Blocks> getBlocksPageByHousingEstatesId(Page page,BlockListDto blockListDto) {
+    public Page<Blocks> getBlocksPageByhousingEstateId(Page page,BlockListDto blockListDto) {
 
-        return blocksMapper.getBlocksPageByHousingEstatesId(page,blockListDto);
+        return blocksMapper.getBlocksPageByhousingEstateId(page,blockListDto);
     }
 }

air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java

@@ -64,7 +64,7 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
     @Override
     public IPage<HousingEstatesName> getHousingEstatesNamePage(IPage<HousingEstatesName> page, String name) {
 
-        return null;
+        return housingEstatesMapper.getHousingEstatesNamePage(page, name);
     }
 
     @Override
@@ -110,14 +110,14 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
     }
 
     @Override
-    public HousingEstatesDetail getHousingEstatesDetail(Long housingEstatesId, Long blockId) {
+    public HousingEstatesDetail getHousingEstatesDetail(Long housingEstateId, Long blockId) {
-        HousingEstates housingEstates = baseMapper.selectById(housingEstatesId);
+        HousingEstates housingEstates = baseMapper.selectById(housingEstateId);
         LandListed landListed = landListedMapper.selectOne(Wrappers.<LandListed>lambdaQuery().eq(LandListed::getAnnoId,housingEstates.getAnnoId()));
         HousingEstatesDetail detail = new HousingEstatesDetail();
         detail.setHousingEstates(housingEstates);
         detail.setLandListed(landListed);
         if(ObjectUtil.isNotNull(blockId)){
-            Format format = formatService.getOne(Wrappers.<Format>lambdaQuery().eq(Format::getHousingEstateId,housingEstatesId));
+            Format format = formatService.getOne(Wrappers.<Format>lambdaQuery().eq(Format::getHousingEstateId,housingEstateId));
             detail.setFormat(format);
         }
         return detail;

air/src/main/java/com/air/housing/vo/HousingEstatesName.java

@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode
 public class HousingEstatesName {
     @ApiModelProperty(value = "楼盘id")
-    private Long housingEstatesId;
+    private Long housingEstateId;
     @ApiModelProperty(value = "楼盘名称")
     private String name;
 }

air/src/main/resources/mapper/BlocksMapper.xml

@@ -7,7 +7,7 @@
         b.block_id,b.housing_estates_id,b.pre_sale_permit_no,b.block_name,b.status_cd,b.status_date,b.create_user_id,b.create_date,b.update_user_id,b.update_date,b.remark
     </sql>
 
-    <select id="getBlocksPageByHousingEstatesId" parameterType="com.air.housing.dto.BlockListDto" resultType="com.air.housing.entity.Blocks">
+    <select id="getBlocksPageByhousingEstateId" parameterType="com.air.housing.dto.BlockListDto" resultType="com.air.housing.entity.Blocks">
         select <include refid="base_block_column"/>
         from blocks b
         <choose>

air/src/main/resources/mapper/HousingEstatesMapper.xml

@@ -7,7 +7,11 @@
     <select id="getHousingEstatesNamePage" resultType="com.air.housing.vo.HousingEstatesName">
         select housing_estate_id, name
         from housing_estates
-        where name like concat('%', #{name}, '%')
+        <where>
+            <if test="name != null and name != ''">
+                name like concat('%', #{name}, '%')
+            </if>
+        </where>
     </select>
 
     <select id="selectIPage" resultType="com.air.housing.vo.HousingEstatesListVO">