工程安全分析

securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/domain/EngineeringSafetyAnalysis.java

@@ -76,4 +76,16 @@ public class EngineeringSafetyAnalysis extends BaseEntity {
     @ApiModelProperty(value = "数量")
     private String count;
 
+    /** 工程名称 */
+    @ApiModelProperty(value = "工程名称")
+    private String proName;
+
+    /** 作业地点 */
+    @ApiModelProperty(value = "作业地点")
+    private String workLocation;
+
+    /** 分析原因 */
+    @ApiModelProperty(value = "分析原因")
+    private String analysisReason;
+
 }

securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EngineeringSafetyAnalysisMapper.xml

@@ -19,6 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="level"    column="level"    />
         <result property="timestamp"    column="timestamp"    />
         <result property="name"    column="name"    />
+        <result property="proName"    column="pro_name"    />
+        <result property="workLocation"    column="work_location"    />
+        <result property="analysisReason"    column="analysis_reason"    />
     </resultMap>
 
     <!--查询安全隐患集合列表-->
@@ -34,9 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COALESCE(ale.avg_temperature, '-') AS temperature,
         COALESCE(ale.avg_humidity, '-') AS humidity,
         COALESCE(ale.avg_wind_speed, '-') AS wind_speed,
-        COALESCE(ale.avg_gas_value, '-') AS gas_value
+        COALESCE(ale.avg_gas_value, '-') AS gas_value,
+        pro.pro_name ,
+        h.work_location,
+        h.analysis_reason
         FROM
         hazards h
+        LEFT JOIN tb_project_new pro on h.bid_code = pro.bid_code
         LEFT JOIN
         monitoring_points mp ON h.bid_code = mp.bid_code
         LEFT JOIN