diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorEvalProjectMonitorPageCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorEvalProjectMonitorPageCO.java index 12a07ff..4bccbe8 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/regulator/RegulatorEvalProjectMonitorPageCO.java +++ b/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; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorRealtimePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorRealtimePageQuery.java index 1808406..4d5bde9 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/regulator/RegulatorEvalProjectMonitorRealtimePageQuery.java +++ b/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; } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml index 9b0061d..b307d86 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml @@ -93,7 +93,7 @@ AND is_statutory = 1 - +