From 261a0aa07bf7e881dfd06babdd9ec6c5727397ba Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Thu, 24 Aug 2023 14:49:02 +0800
Subject: [PATCH] =?UTF-8?q?#=E6=B5=81=E7=A8=8B=E7=BB=9F=E8=AE=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/alert/constants/AbnormalAlarmConstant.java    | 2 +-
 .../com/hnac/hzims/operational/station/entity/StationEntity.java    | 5 +++++
 .../service/operation/business/impl/MaintenanceServiceImpl.java     | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

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<MaintenanceMapper, O
             e.printStackTrace();
         }
     }
-
+    
     /**
      * 开启一个流程实例
      **/
@@ -247,7 +247,7 @@ public class MaintenanceServiceImpl extends BaseServiceImpl<MaintenanceMapper, O
         }
         // 日常维护完成数
         maintainVo.setMaintain(maintainList.size());
-        List<Long> maintainFinish = maintainList.stream().filter(o-> Func.isNotEmpty(o.getStatus()) && MaintenanceConstant.TASK_STATUS_5 == o.getStatus())
+        List<Long> 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<MaintenanceMapper, O
         regularWorkVO.setMainTaskIds(regularWorkList.stream().map(OperMaintenanceTaskEntity::getId).map(Object::toString).collect(Collectors.joining(",")));
         regularWorkVO.setRegularWorkSum(regularWorkList.size());
         // 定期工作任务完成数量
-        List<OperMaintenanceTaskEntity> regularWorkFinishList = regularWorkList.stream().filter(o -> MaintenanceConstant.TASK_STATUS_5 == o.getStatus()).collect(Collectors.toList());
+        List<OperMaintenanceTaskEntity> regularWorkFinishList = regularWorkList.stream().filter(o -> "结束".equals(o.getFlowTaskName())).collect(Collectors.toList());
         if (CollectionUtil.isEmpty(regularWorkFinishList)) {
             regularWorkVO.setRegularWork(0);
             return regularWorkVO;