1、开发接口根据计划id、楼宇id、楼层id、房间id获取房间列表

2、修改接口获取项目下的楼宇添加针对类型筛选

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.controller;
 
 import com.censoft.censoftrongtong.domain.*;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.service.*;
@@ -42,6 +43,9 @@ public class RiskPlanAppController extends BaseController {
     @Resource
     private IRiskPlanService riskPlanService;
 
+    @Resource
+    private IRiskPlanInherentListService riskPlanInherentListService;
+
     /**
      * 获取自身部门及以下的项目
      *
@@ -59,11 +63,12 @@ public class RiskPlanAppController extends BaseController {
      * 获取项目下的楼宇
      *
      * @param projectId 项目id
+     * @param type 类型 地上、地下
      * @real_return {@link R<List<LedgerBuilding>>}
      */
     @GetMapping("/building/list/{projectId}")
-    public R<List<LedgerBuilding>> getBuildingListByProjectId(@PathVariable("projectId") Long projectId){
-        return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId));
+    public R<List<LedgerBuilding>> getBuildingListByProjectId(@PathVariable("projectId") Long projectId,String type){
+        return R.ok(ledgerBuildingService.getBuildingListByProjectId(projectId,type));
     }
 
     /**
@@ -161,4 +166,19 @@ public class RiskPlanAppController extends BaseController {
     public R<List<LedgerRoom>> getRoomListByBuildingId(@PathVariable("floorId") Long floorId){
         return R.ok(ledgerRoomService.getRoomListByBuildingId(floorId));
     }
+
+    /**
+     * 根据计划id、楼宇id、楼层id、房间id获取房间列表
+     *
+     * @param planId 计划id
+     * @param buildingId 楼宇id
+     * @param floorId 楼层id
+     * @param roomId 房间id
+     * @real_return {@link R<List<LedgerRoom>>}
+     */
+    @GetMapping("/inherent/list/{planId}/{buildingId}")
+    public R<List<RiskPlanAppInherentListDto>> getInherentListByPlanId(@PathVariable("planId") Long planId
+            ,@PathVariable("buildingId") Long buildingId,Long floorId,Long roomId){
+        return R.ok(riskPlanInherentListService.getInherentListByPlanId(planId,buildingId, floorId, roomId));
+    }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanInherentList.java

 package com.censoft.censoftrongtong.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppInherentListDto.java

+package com.censoft.censoftrongtong.domain.dto;
+
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-06-27 14:45:45
+ */
+@Data
+public class RiskPlanAppInherentListDto {
+    /** id */
+    private Long id;
+
+    /** 风险源名称 */
+    private String name;
+
+    /** 楼层id */
+    private Long floorId;
+
+    /** 楼层名称 */
+    private String floorName;
+
+    /** 房间id */
+    private Long roomId;
+
+    /** 房间名称 */
+    private String roomName;
+
+    /** 评估人id */
+    private Long userId;
+
+    /** 评估人名称 */
+    private String userName;
+
+    /** 评估人头像 */
+    private String avatar;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanInherentListMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +61,6 @@ public interface RiskPlanInherentListMapper
      * @return 结果
      */
     public int deleteRiskPlanInherentListByIds(Long[] ids);
+
+    List<RiskPlanAppInherentListDto> getInherentListByPlanId(@Param("planId") Long planId, @Param("buildingId") Long buildingId, @Param("floorId") Long floorId, @Param("roomId") Long roomId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerBuildingService.java

@@ -60,7 +60,7 @@ public interface ILedgerBuildingService
      */
     public int deleteLedgerBuildingById(Long id);
 
-    List<LedgerBuilding> getBuildingListByProjectId(Long projectId);
+    List<LedgerBuilding> getBuildingListByProjectId(Long projectId,String type);
 
     List<LedgerBuilding> getBuildingListByIds(List<String> ids);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanInherentListService.java

 package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
 
 import java.util.List;
 
@@ -59,4 +60,6 @@ public interface IRiskPlanInherentListService
      * @return 结果
      */
     public int deleteRiskPlanInherentListById(Long id);
+
+    List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerBuildingServiceImpl.java

@@ -96,9 +96,10 @@ public class LedgerBuildingServiceImpl implements ILedgerBuildingService
     }
 
     @Override
-    public List<LedgerBuilding> getBuildingListByProjectId(Long projectId) {
+    public List<LedgerBuilding> getBuildingListByProjectId(Long projectId,String type) {
         LedgerBuilding query = new LedgerBuilding();
         query.setProjectId(projectId);
+        query.setType(type);
         query.setStatus("0");
         return selectLedgerBuildingList(query);
     }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanInherentListServiceImpl.java

@@ -3,6 +3,7 @@ package com.censoft.censoftrongtong.service.impl;
 import java.util.List;
 
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
 import com.censoft.censoftrongtong.mapper.RiskPlanInherentListMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
 import com.ruoyi.common.utils.DateUtils;
@@ -94,4 +95,9 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer
     {
         return riskPlanInherentListMapper.deleteRiskPlanInherentListById(id);
     }
+
+    @Override
+    public List<RiskPlanAppInherentListDto> getInherentListByPlanId(Long planId, Long buildingId, Long floorId, Long roomId) {
+        return riskPlanInherentListMapper.getInherentListByPlanId(planId, buildingId, floorId, roomId);
+    }
 }

censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml

@@ -67,7 +67,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRiskPlanInherentListVo"/>
         where id = #{id}
     </select>
-        
+    <select id="getInherentListByPlanId"
+            resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto">
+        SELECT
+            rpil.id,
+            rpil.`name`,
+            lf.id AS floorId,
+            lf.`name` AS floorName,
+            lr.id AS roomId,
+            lr.`name` AS roomName,
+            su.user_id AS userId,
+            su.nick_name AS userName,
+            su.avatar
+        FROM
+            risk_plan_inherent_list rpil
+                LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
+                LEFT JOIN ledger_floor lf ON lf.id = floor_id
+                LEFT JOIN sys_user su ON su.user_id = rpil.user_id
+        <where>
+            <if test="planId != null"> AND rpil.plan_id = #{planId}</if>
+            <if test="buildingId != null"> AND lf.building_id = #{buildingId}</if>
+            <if test="floorId != null"> AND lf.id = #{floorId}</if>
+            <if test="roomId != null"> AND lr.id = #{roomId}</if>
+        </where>
+    </select>
+
     <insert id="insertRiskPlanInherentList" parameterType="com.censoft.censoftrongtong.domain.RiskPlanInherentList" useGeneratedKeys="true" keyProperty="id">
         insert into risk_plan_inherent_list
         <trim prefix="(" suffix=")" suffixOverrides=",">