1、app端现状风险列表添加楼宇楼层房间名称字段

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

@@ -18,6 +18,24 @@ public class RiskPlanAppExistingListDto {
     /** 风险源名称 */
     private String name;
 
+    /** 楼宇id */
+    private Long buildingId;
+
+    /** 楼宇名称 */
+    private String buildingName;
+
+    /** 楼层id */
+    private Long floorId;
+
+    /** 楼层名称 */
+    private String floorName;
+
+    /** 房间id */
+    private Long roomId;
+
+    /** 房间名称 */
+    private String roomName;
+
     /** 风险系数 */
     private String coefficient;
 

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

@@ -99,10 +99,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             su.nick_name AS userName,
             su.avatar,
             reil.level,
-            reil.factor
+            reil.factor,
+            lb.id AS buildingId,
+            lb.`name` AS buildingName,
+            lf.id AS floorId,
+            lf.`name` AS floorName,
+            lr.id AS roomId,
+            lr.`name` AS roomName
         FROM
             risk_plan_existing_list reil
                 LEFT JOIN sys_user su ON su.user_id = reil.user_id
+                LEFT JOIN risk_plan_inherent_list rpil ON rpil.id = reil.inherent_id
+                LEFT JOIN ledger_room lr ON lr.id = rpil.room_id
+                LEFT JOIN ledger_floor lf ON lf.id = lr.floor_id
+                LEFT JOIN ledger_building lb ON lb.id = lf.building_id
         WHERE
             reil.inherent_id = #{inherentId}
     </select>