Merge remote-tracking branch 'origin/dev_ic_mp' into develop

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,