diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/constants/AbnormalAlarmConstant.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/constants/AbnormalAlarmConstant.java index 9ece78b..72f7643 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/constants/AbnormalAlarmConstant.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/constants/AbnormalAlarmConstant.java @@ -23,7 +23,7 @@ public interface AbnormalAlarmConstant { /**故障**/ String FAULT = "3"; - + /**预警**/ Long EARLY_WARNING = 20L; diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java index 1721302..166eafc 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/station/entity/StationEntity.java @@ -173,4 +173,9 @@ public class StationEntity extends TenantEntity implements Serializable { @QueryField(condition = SqlCondition.EQUAL) @TableField(updateStrategy = FieldStrategy.IGNORED) private Boolean isAbroad; + + @ApiModelProperty("所属国家") + @QueryField(condition = SqlCondition.EQUAL) + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String refCountry; } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java index ba446b0..b2597db 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java @@ -156,7 +156,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl maintainFinish = maintainList.stream().filter(o-> Func.isNotEmpty(o.getStatus()) && MaintenanceConstant.TASK_STATUS_5 == o.getStatus()) + List maintainFinish = maintainList.stream().filter(o-> "结束".equals(o.getFlowTaskName())) .map(OperMaintenanceTaskEntity::getId).collect(Collectors.toList()); if(CollectionUtil.isEmpty(maintainFinish)){ maintainVo.setMaintainFinish(0); @@ -281,7 +281,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl regularWorkFinishList = regularWorkList.stream().filter(o -> MaintenanceConstant.TASK_STATUS_5 == o.getStatus()).collect(Collectors.toList()); + List regularWorkFinishList = regularWorkList.stream().filter(o -> "结束".equals(o.getFlowTaskName())).collect(Collectors.toList()); if (CollectionUtil.isEmpty(regularWorkFinishList)) { regularWorkVO.setRegularWork(0); return regularWorkVO;