From c05a338fbb5a38497e45d5a32695936a5b804c62 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Tue, 31 May 2022 14:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E9=A1=B9=E7=9B=AE=E3=80=91=E6=9C=8D=E5=8A=A1=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0ID=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/ServiceProjectRecordResultDTO.java    | 1 +
 .../src/main/resources/mapper/IcServiceRecordDao.xml           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceProjectRecordResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceProjectRecordResultDTO.java
index 2be681cde3..940a8ae9f1 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceProjectRecordResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceProjectRecordResultDTO.java
@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class ServiceProjectRecordResultDTO {
+    private String serviceRecordId;
     private String serviceCategoryKey;
     private String serviceCategoryName;
     private String serviceProjectId;
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
index 1b9e78ab26..33c9d5ce0f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml
@@ -24,7 +24,8 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
     <select id="listServiceRecords" resultType="com.epmet.dto.result.ServiceProjectRecordResultDTO">
-        select record.SERVICE_CATEGORY_KEY,
+        select record.ID as serviceRecordId,
+                record.SERVICE_CATEGORY_KEY,
                record.SERVICE_PROJECT_ID,
                record.SERVICE_PROJECT_NAME,
                record.SERVICE_ORG_ID,