增加返回组织坐标，增加个人信息爱好；

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

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;
+
 
 
 
 
 
 
-}
+}

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);
 

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;
+
     /**
      * 工作单位行业
      */

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<UserDjylDao, UserDjylEn
         }
         baseDao.updateById(entity);
 
-        UserGridRelationEntity entity1 = new UserGridRelationEntity();
+        UserGridRelationEntity gridRelation = new UserGridRelationEntity();
-        entity1.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
+        gridRelation.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
-        entity1.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
+        gridRelation.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
-        entity1.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
+        gridRelation.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
-        entity1.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+        gridRelation.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
-        entity1.setGridId(parentAndAllDeptDTOResult.getData().getGridId());
+        gridRelation.setGridId(parentAndAllDeptDTOResult.getData().getGridId());
-        entity1.setGrid(parentAndAllDeptDTOResult.getData().getGrid());
+        gridRelation.setGrid(parentAndAllDeptDTOResult.getData().getGrid());
         LambdaUpdateWrapper<UserGridRelationEntity> updateWrapper = Wrappers.lambdaUpdate();
         updateWrapper.eq(UserGridRelationEntity::getUserId, entity.getId());
-        userGridRelationService.update(entity1, updateWrapper);
+        userGridRelationService.update(gridRelation, updateWrapper);
 
         return new Result<String>().ok("修改成功");
     }