From 8e472fdd6fd53ea9118839d969007fac8f5cdf88 Mon Sep 17 00:00:00 2001 From: luyan Date: Mon, 11 Mar 2024 11:15:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=9D=90=E6=A0=87=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=88=B1=E5=A5=BD=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/SysDeptDao.xml | 4 +++- .../dto/result/EpdcPartyMemberRegistDTO.java | 11 +++++++++-- .../epdc/service/impl/AppUserServiceImpl.java | 4 ++++ .../epdc/form/EpdcUserNpmRegisterFormDTO.java | 5 +++++ .../user/service/impl/UserDjylServiceImpl.java | 16 ++++++++-------- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index ef6cff754..400795b3e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -504,7 +504,9 @@ d.mobile, d.telephone, d.secretary_name, - d2.`NAME` streetName + d2.`NAME` streetName, + d.longitude, + d.latitude FROM sys_dept d LEFT JOIN sys_dept d2 ON d.pid = d2.id diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java index 8b66d9058..e2a543989 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcPartyMemberRegistDTO.java @@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * 打卡列表 @@ -53,6 +52,10 @@ public class EpdcPartyMemberRegistDTO implements Serializable { */ private String liveTelephone; + private String liveLongitude; + + private String liveLatitude; + /** * 现居住社区办公电话 @@ -91,10 +94,14 @@ public class EpdcPartyMemberRegistDTO implements Serializable { */ private String couplingSecretaryName; + private String couplingLongitude; + + private String couplingLatitude; + -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index d3da90f00..bc59b939a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1643,6 +1643,8 @@ public class AppUserServiceImpl implements AppUserService { partyMemberRegistDTO.setLiveSecretaryName(liveDept.getSecretaryName()); partyMemberRegistDTO.setLiveTelephone(liveDept.getTelephone()); partyMemberRegistDTO.setLiveStreetName(liveDept.getStreetName()); + partyMemberRegistDTO.setLiveLongitude(liveDept.getLongitude()); + partyMemberRegistDTO.setLiveLatitude(liveDept.getLatitude()); } if (null != dto.getCouplingCommunity()) { formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getCouplingCommunity().length-2])); @@ -1653,6 +1655,8 @@ public class AppUserServiceImpl implements AppUserService { partyMemberRegistDTO.setCouplingSecretaryName(couplingDept.getSecretaryName()); partyMemberRegistDTO.setCouplingelephone(couplingDept.getTelephone()); partyMemberRegistDTO.setCouplingStreetName(couplingDept.getStreetName()); + partyMemberRegistDTO.setCouplingLongitude(couplingDept.getLongitude()); + partyMemberRegistDTO.setCouplingLatitude(couplingDept.getLatitude()); } userFeignClient.saveReportparty(dto); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java index 85dc00656..b5536aa15 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/EpdcUserNpmRegisterFormDTO.java @@ -47,6 +47,11 @@ public class EpdcUserNpmRegisterFormDTO implements Serializable { */ private String workType; + /** + * 服务意向（个人爱好） + */ + private String hobbies; + /** * 工作单位行业 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java index f2d87d810..7f97c0e26 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/UserDjylServiceImpl.java @@ -126,16 +126,16 @@ public class UserDjylServiceImpl extends BaseServiceImpl updateWrapper = Wrappers.lambdaUpdate(); updateWrapper.eq(UserGridRelationEntity::getUserId, entity.getId()); - userGridRelationService.update(entity1, updateWrapper); + userGridRelationService.update(gridRelation, updateWrapper); return new Result().ok("修改成功"); }