From e09c775135a79d0d68399b75682b8f2ad3c27bae Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 5 Jan 2022 17:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=E7=9A=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E9=83=BD=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E6=98=AF=E5=B0=8F=E5=8C=BA=E8=AF=A6=E7=BB=86=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80+=E5=B0=8F=E5=8C=BA=E5=90=8D=E7=A7=B0=EF=BC=9B?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=AD=E5=92=8C=E5=B7=B2=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=85=B7=E4=BD=93=E5=88=B0=E9=97=A8=E7=89=8C=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/IcUserDemandRecDao.xml   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

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 92e7a3efab..4bb193f075 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
@@ -207,7 +207,14 @@
                 END
             ) as epmetUserId,
             r.AWARD_POINT as awardPoint,
-            concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL ) AS serviceAddress,
+            (
+                case when r.status ='pending' then r.SERVICE_LOCATION
+                when r.status ='assigned' then   concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL )
+                when r.status ='have_order' then  concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL )
+                when r.status ='finished' then   concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL )
+                else ''
+                end
+            ) AS serviceAddress,
             r.SERVICE_LOCATION,
             r.LOCATION_DETAIL,
             r.LONGITUDE,
@@ -447,7 +454,15 @@
             r.CATEGORY_CODE,
             r.PARENT_CODE,
             r.WANT_SERVICE_TIME,
-            concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL ) AS serviceAddress,
+            <if test="null !=type and type =='unprocessed' ">
+                r.SERVICE_LOCATION AS serviceAddress,
+            </if>
+            <if test="null !=type and type =='processing' ">
+                concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL ) AS serviceAddress,
+            </if>
+            <if test="null !=type and type =='finished' ">
+                concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL ) AS serviceAddress,
+            </if>
             r.AWARD_POINT,
             r.DEMAND_USER_NAME,
             r.DEMAND_USER_MOBILE,