feats

src/main/java/com/huiju/estateagents/property/controller/TpRoomNoController.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.property.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.model.TpRoomNo;
+import com.huiju.estateagents.property.service.BuildingTreeServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+@Api(tags = "楼栋房源信息表 ")
+@RestController
+@RequestMapping("/api/{client}/buildingInfo/building-room")
+public class TpRoomNoController extends BaseController {
+
+    @Autowired
+    BuildingTreeServiceI buildingTreeService;
+
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @GetMapping("/list")
+    public ResponseBean getList(@ApiParam(value = "客户端", allowableValues = "admin") @PathVariable String client,
+                                @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("期数ID") @RequestParam(value ="phaseId", required = false) Integer phaseId,
+                                @ApiParam("楼栋ID") @RequestParam(value ="buildingId", required = false) Integer buildingId,
+                                @ApiParam("单元ID") @RequestParam(value ="unitId", required = false) Integer unitId,
+                                @ApiParam("楼层ID") @RequestParam(value ="levelId", required = false) Integer levelId,
+                                @ApiParam("户号ID") @RequestParam(value ="roomNoId", required = false) Integer roomNoId,
+                                HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        IPage<TpRoomNo> page = new Page<>(pageNum, pageSize);
+
+        IPage<TpRoomNo> result = buildingTreeService.getRoomList(page, orgId, phaseId, buildingId, unitId, levelId, roomNoId);
+
+        return ResponseBean.success(result);
+    }
+
+}

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.property.model.TpRoomNo;
 import org.apache.ibatis.annotations.*;
 
@@ -67,4 +68,5 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
 
     List<TpRoomNo> selectComunityList(@Param("orgId") Integer orgId, @Param("phaseId") String phaseId, @Param("buildingId") String buildingId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
+    IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, @Param("orgId") Integer orgId,@Param("phaseId") Integer phaseId,@Param("buildingId") Integer buildingId,@Param("unitId") Integer unitId,@Param("levelId") Integer levelId,@Param("roomNoId") Integer roomNoId);
 }

src/main/java/com/huiju/estateagents/property/service/BuildingTreeServiceI.java

@@ -1,8 +1,10 @@
 package com.huiju.estateagents.property.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.model.TpRoomNo;
 import org.springframework.web.multipart.MultipartFile;
 
 public interface BuildingTreeServiceI {
@@ -46,4 +48,6 @@ public interface BuildingTreeServiceI {
 	 * @return
 	 */
 	ResponseBean deleteNode(String parameter, Integer orgId);
+
+	IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
 }

src/main/java/com/huiju/estateagents/property/service/impl/BuildingTreeServiceImpl.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.property.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
@@ -585,6 +586,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		return responseBean;
 	}
 
+	@Override
+	public IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
+		return tpRoomNoMapper.getRoomList(page, orgId, phaseId, buildingId, unitId, levelId, roomNoId);
+	}
+
 	private void saveBuildingTreeData(Integer orgId, List<TpBuildingOwnerInfo> list) {
 		String lastPhaseName = "";
 		String lastBuildingName = "";

src/main/resources/mapper/property/TpRoomNoMapper.xml

@@ -79,4 +79,32 @@
         </if>
         LIMIT #{pageNum}, #{pageSize}
     </select>
+    <select id="getRoomList" resultType="com.huiju.estateagents.property.model.TpRoomNo">
+        SELECT
+            t.*
+        FROM
+            tp_room_no t
+            INNER JOIN tp_level s ON s.id = t.level_id
+            INNER JOIN tp_unit m ON m.id = t.unit_id
+            INNER JOIN tp_building n ON n.id = t.building_id
+            INNER JOIN tp_phase q ON q.id = t.phase_id
+        WHERE
+            t.org_id = #{orgId}
+        <if test="roomNoId != null" >
+            and t.id = #{roomNoId}
+        </if>
+        <if test="phaseId != null" >
+            and t.phase_id = #{phaseId}
+        </if>
+        <if test="buildingId != null" >
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="unitId != null" >
+            and t.unit_id = #{unitId}
+        </if>
+        <if test="levelId != null" >
+            and t.level_id = #{levelId}
+        </if>
+        ORDER BY t.phase_id ASC, t.building_id ASC, t.unit_id ASC, (t.level_name - 0) DESC
+    </select>
 </mapper>