From e903d89fb1dfa6b759d7323d400ef1dafba0bb74 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 23 May 2022 16:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9Eorigin\originId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/demand/DemandRecResultDTO.java  | 9 +++++++++
 .../src/main/resources/mapper/IcUserDemandRecDao.xml     | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
index c235915430..bbf2c8f3ff 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandRecResultDTO.java
@@ -139,4 +139,13 @@ public class DemandRecResultDTO implements Serializable {
     private String longitude;
     // 纬度,需求人是ic的居民时，取所住楼栋的中心点位
     private String latitude;
+
+    /**
+     * 来源[需求录入:demand  事件管理:ic_event]
+     */
+    private String origin;
+    /**
+     * 来源Id[目前只有来源事件管理的有值]
+     */
+    private String originId;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
index dd7cf16d8a..4d215c16d9 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
@@ -85,7 +85,9 @@
                 CASE WHEN R.DEMAND_USER_TYPE='mini_resi' THEN R.DEMAND_USER_ID
                 ELSE ''
                 END
-            ) as epmetUserId
+            ) as epmetUserId,
+            r.ORIGIN AS origin,
+            r.ORIGIN_ID AS originId
         FROM
             ic_user_demand_rec r
             left JOIN ic_user_demand_service s ON ( r.id = s.DEMAND_REC_ID AND s.DEL_FLAG = '0' )