diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDetailResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDetailResDTO.java index 2a829c2bb4..cad6a2c4dd 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDetailResDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/demand/DemandDetailResDTO.java @@ -56,6 +56,17 @@ public class DemandDetailResDTO implements Serializable { */ private String serviceAddress; + // 服务地点,工作端指派默认居民居住房屋地址,居民端地图选择 + private String serviceLocation; + // 门牌号详细地址 + private String locationDetail; + // 经度,需求人是ic的居民时,取所住楼栋的中心点位 + private String longitude; + // 纬度,需求人是ic的居民时,取所住楼栋的中心点位 + private String latitude; + + + /** * 实际服务开始时间 */ 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 6a6c5145f1..c235915430 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 @@ -131,4 +131,12 @@ public class DemandRecResultDTO implements Serializable { * 服务地点 */ private String serviceAddress; + // 服务地点,工作端指派默认居民居住房屋地址,居民端地图选择 + private String serviceLocation; + // 门牌号详细地址 + private String locationDetail; + // 经度,需求人是ic的居民时,取所住楼栋的中心点位 + private String longitude; + // 纬度,需求人是ic的居民时,取所住楼栋的中心点位 + private String latitude; } 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 9b0b0949c6..7123e44860 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,11 @@ END ) as epmetUserId, r.AWARD_POINT as awardPoint, - concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL ) AS serviceAddress + concat( r.SERVICE_LOCATION, r.LOCATION_DETAIL ) AS serviceAddress, + r.SERVICE_LOCATION, + r.LOCATION_DETAIL, + r.LONGITUDE, + r.LATITUDE 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' )