1、添加app端固有风险详情字段

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

@@ -49,10 +49,20 @@ public class RiskPlanAppInherentListDetailsDto {
     /** 风险源名称 */
     private String name;
 
+    /**
+     * 风险点类型
+     */
+    private String pointType;
+
+    /**
+     * 安全警示标志
+     */
+    private String safetyWarningSigns;
+
     /** 风险因素 */
     private String factor;
 
-    /** 事故类型 */
+    /** 准事故类型 */
     private String type;
 
     /** 风险等级 */
@@ -76,15 +86,50 @@ public class RiskPlanAppInherentListDetailsDto {
     /** 工程技术措施附件 */
     private List<SysUploadFile> measuresProjectFile;
 
-    /** 管理措施 */
+    /** 应采取的管理措施 */
     private String measuresAdministration;
 
+    /**
+     * 管控责任单位id
+     */
+    private Long measuresDeptId;
+
+    /**
+     * 管控责任单位
+     */
+    private String measuresDeptName;
+
+    /**
+     * 管控责任人id
+     */
+    private Long measuresUserId;
+
+    /**
+     * 管控责任人
+     */
+    private Long measuresUserName;
+
     /** 管理措施附件 */
     private String measuresAdministrationFileIds;
 
     /** 管理措施附件 */
     private List<SysUploadFile> measuresAdministrationFile;
 
+    /**
+     * 危险源名称
+     */
+    private String hazardSourceName;
+
+    /**
+     * 是否存在重大危险源
+     */
+    private Boolean majorHazardSource;
+
+    /**
+     * 重大危险源描述
+     */
+    private String majorHazardSourceDescription;
+
     /** 应急处置措施 */
     private String measuresEmergency;
 

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

@@ -45,6 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             lr.id AS roomId,
             lr.`name` AS roomName,
             rpil.`name`,
+            rpil.point_type as pointType,
+            rpil.safety_warning_signs as safetyWarningSigns,
             rpil.factor,
             rpil.type,
             rpil.`level`,
@@ -55,7 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rpil.measures_project AS measuresProject,
             rpil.measures_project_file_ids AS measuresProjectFileIds,
             rpil.measures_administration AS measuresAdministration,
+            sd.dept_id as measuresDeptId,
+            sd.dept_name as measuresDeptName,
+            su2.user_id AS measuresUserId,
+            su2.nick_name AS measuresUserName,
             rpil.measures_administration_file_ids AS measuresAdministrationFileIds,
+            rpil.hazard_source_name AS hazardSourceName,
+            rpil.major_hazard_source AS majorHazardSource,
+            rpil.major_hazard_source_description AS majorHazardSourceDescription,
             rpil.measures_emergency AS measuresEmergency,
             rpil.measures_emergency_file_ids AS measuresEmergencyFileIds,
             rpil.reference_basis AS referenceBasis
@@ -67,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 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
+                LEFT JOIN sys_dept sd ON sd.dept_id = rpil.measures_dept_id
+                LEFT JOIN sys_user su2 ON su2.user_id = rpil.measures_user_id
         WHERE
             rpil.id = #{inherentId}
     </select>