1、修改app端任务单详情风险清单列表接口添加字段

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

@@ -19,6 +19,12 @@ public class RiskPlanAppInherentListDto {
     /** 风险源名称 */
     private String name;
 
+    /** 楼宇id */
+    private Long buildingId;
+
+    /** 楼宇名称 */
+    private String buildingName;
+
     /** 楼层id */
     private Long floorId;
 

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

@@ -8,6 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             rpil.id,
             rpil.`name`,
+            lb.id AS buildingId,
+            lb.`name` AS buildingName,
             lf.id AS floorId,
             lf.`name` AS floorName,
             lr.id AS roomId,
@@ -23,12 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ledger_floor lf ON lf.id = floor_id
                 LEFT JOIN sys_user su ON su.user_id = rpil.user_id
                 LEFT JOIN ledger_building lb ON lb.id = lf.building_id
+                LEFT JOIN sys_dict_data sdd ON sdd.dict_label = rpil.LEVEL
+                AND dict_type = 'risk_plan_level'
         <where>
             <if test="projectId != null"> AND lb.project_id = #{projectId}</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>
+        ORDER BY
+        sdd.dict_sort DESC
     </select>
     <select id="getRiskPlanAppInherentListDetailsDtoByInherentId"
             resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto">