1

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorEvalProjectMonitorPageCO.java

@@ -37,4 +37,19 @@ public class RegulatorEvalProjectMonitorPageCO {
 
     @ApiModelProperty("计划完成日期")
     private LocalDate planEndDate;
+
+    @ApiModelProperty("预警状态：normal正常；abnormal异常")
+    private String waringStatus;
+
+    @ApiModelProperty("过程预警状态")
+    private String processWaringStatus;
+
+    @ApiModelProperty("过程预警信息")
+    private String processWaringMsg;
+
+    @ApiModelProperty("人员预警状态")
+    private String personnelWaringStatus;
+
+    @ApiModelProperty("人员预警信息")
+    private String personnelWaringMsg;
 }

safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorRealtimePageQuery.java

@@ -37,4 +37,7 @@ public class RegulatorEvalProjectMonitorRealtimePageQuery extends BasePageQuery
     @ApiModelProperty("计划完成日期-止")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate planEndDateEnd;
+
+    @ApiModelProperty("监管状态：normal正常；PERSONNEL_ABNORMAL人员异常")
+    private String waringStatus;
 }

safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml

@@ -93,7 +93,7 @@
           AND is_statutory = 1
     </select>
 
-    <!-- 监管端-安评项目实时监控分页：未删除且法定项目(is_statutory=1)，关联 org_info 获取评价机构名称 -->
+    <!-- 监管端-安评项目实时监控分页：未删除且法定项目(is_statutory=1)，关联 org_info 获取评价机构名称，关联 eval_project_process_waring 获取预警信息 -->
     <select id="selectRegulatorMonitorPage"
             resultType="org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectMonitorPageCO">
         SELECT
@@ -105,11 +105,18 @@
             p.eval_type_code,
             p.industry_code,
             p.customer_contact_name AS leader_name,
-            p.plan_end_date
+            p.plan_end_date,
+            w.waring_status,
+            w.process_waring_status,
+            w.process_waring_msg,
+            w.personnel_waring_status,
+            w.personnel_waring_msg
         FROM eval_project p
         LEFT JOIN org_info o
             ON o.id = p.org_id
            AND o.delete_enum = 'false'
+        LEFT JOIN eval_project_process_waring w
+            ON w.project_id = p.id
         WHERE p.delete_enum = 'false'
           AND p.is_statutory = 1
         <if test="query.projectNameOrNo != null and query.projectNameOrNo != ''">
@@ -134,6 +141,12 @@
         <if test="query.planEndDateEnd != null">
             AND p.plan_end_date &lt;= #{query.planEndDateEnd}
         </if>
+        <if test="query.waringStatus != null and query.waringStatus == 'normal'">
+            AND w.waring_status = 'normal'
+        </if>
+        <if test="query.waringStatus != null and query.waringStatus == 'PERSONNEL_ABNORMAL'">
+            AND w.personnel_waring_status = 'abnormal'
+        </if>
         ORDER BY p.id DESC
     </select>