#流程统计修改

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;
 }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/business/impl/MaintenanceServiceImpl.java

@@ -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;