From 10ba0e04f634dd5deb0770e57a2524fb4610c685 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 20 May 2022 15:50:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=87=8F=E5=8C=96=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E7=BB=9F=E8=AE=A1=E4=BF=9D=E5=AD=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8CmapData=E7=9A=84sql=E6=9F=A5=E8=AF=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyMemberPointController.java | 6 ++++-- .../dto/result/VolunteerPolyMapDataResultDTO.java | 9 +++++++++ .../src/main/resources/mapper/IcVolunteerPolyDao.xml | 10 +++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java index fd2277d091..99c9ba57c4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java @@ -54,7 +54,8 @@ public class IcPartyMemberPointController { @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcPartyMemberPointDTO dto) { + public Result save(@RequestBody IcPartyMemberPointDTO dto,@LoginUser TokenDto tokenDto) { + dto.setCustomerId(tokenDto.getCustomerId()); //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icPartyMemberPointService.save(dto); @@ -63,7 +64,8 @@ public class IcPartyMemberPointController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody IcPartyMemberPointDTO dto) { + public Result update(@RequestBody IcPartyMemberPointDTO dto,@LoginUser TokenDto tokenDto) { + dto.setCustomerId(tokenDto.getCustomerId()); //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icPartyMemberPointService.update(dto); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java index 13716b0071..7ec767f92c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VolunteerPolyMapDataResultDTO.java @@ -62,4 +62,13 @@ public class VolunteerPolyMapDataResultDTO implements Serializable { * 人户状况 */ private String rhzk; + + private String longitude; + + private String latitude; + + /** + * 类别 + */ + private String volunteerCategory; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml index f8ae7b74a0..915728c6d2 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml @@ -30,10 +30,14 @@ u.gzdw, u.rhzk, u.GRID_ID, - u.HOME_ID + u.HOME_ID, + p.LONGITUDE, + p.LATITUDE, + c.VOLUNTEER_CATEGORY FROM - ic_volunteer p - LEFT JOIN ic_resi_user u ON p.IC_RESI_USER = u.id and u.del_flag = '0' + ic_volunteer_poly p + LEFT JOIN ic_resi_user u ON p.IC_RESI_USER = u.id and u.DEL_FLAG = '0' + left join ic_volunteer_poly_category c on c.ID_CARD = p.ID_CARD and c.DEL_FLAG = '0' p.del_flag = '0' AND p.CUSTOMER_ID = #{customerId}