From cf07cd55fdf7a158e7c477762a0f1b2416aab233 Mon Sep 17 00:00:00 2001
From: yang_shj <yang_shj@hisuntech.com>
Date: Thu, 23 Mar 2023 10:44:11 +0800
Subject: [PATCH] =?UTF-8?q?#SDK=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java  | 6 ++++++
 .../hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml    | 9 +++++++--
 .../operational/main/service/impl/RunMonthReportServiceImpl.java | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java
index 59c148f..a984a51 100644
--- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java
+++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/alert/vo/AlarmHandleVo.java
@@ -38,10 +38,16 @@ public class AlarmHandleVo extends AlarmHandleEntity {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long phenomenonId;
 
+	@ApiModelProperty("现象流程Id")
+	private String checkProcessInstanceId;
+
 	@ApiModelProperty("检修ID")
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long accessId;
 
+	@ApiModelProperty("检修流程Id")
+	private String processInstanceId;
+
 	@ApiModelProperty("用户名称")
 	private String userName;
 }
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml
index 9cf8d26..e9c6176 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AlarmHandleMapper.xml
@@ -5,11 +5,16 @@
 
     <select id="selectHandlePage" resultType="com.hnac.hzims.operational.alert.vo.AlarmHandleVo">
         select h.*,handle_user,d.phenomenon_id,d.access_id,d.delay_time,d.delay_cause,
-        d.false_alarm_desc,d.file_path,s.name as station_name
-        from hzims_alarm_handle h left join  hzims_alarm_handle_detail d
+        d.false_alarm_desc,d.file_path,s.name as station_name,p.check_process_instance_id,a.process_instance_id
+        from hzims_alarm_handle h
+        left join  hzims_alarm_handle_detail d
         on h.detail_id = d.id
         left join hzims_station s
         on h.station_code = s.code
+        left join hzims_oper_phenomenon p
+        on d.PHENOMENON_ID = p.id
+        left join hzims_oper_access_plan a
+        on d.access_id = a.id
         <where>
             h.is_deleted = 0
             <if test="param.handleUser != null">
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java
index ecdc127..37a8cd2 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/RunMonthReportServiceImpl.java
@@ -355,7 +355,7 @@ public class RunMonthReportServiceImpl extends ServiceImpl<RunMonthReportMapper,
 		soeQueryCondition.setStationId(station.getCode());
 		soeQueryCondition.setBeginTime(DateUtil.parse(map.get("startTime"), DateUtil.PATTERN_DATETIME));
 		soeQueryCondition.setEndTime(DateUtil.parse(map.get("endTime"), DateUtil.PATTERN_DATETIME));
-		Result<List<SoeData>> byTypeAndTimeRange = soeClient.getByTypeAndTimeRange(soeQueryCondition);
+		R<List<SoeData>> byTypeAndTimeRange = soeClient.getByTypeAndTimeRange(soeQueryCondition);
 		List<SoeData> soeDataList = new ArrayList<>();
 		List<SoeData> collect = new ArrayList<>();
 		if (byTypeAndTimeRange.isSuccess()) {