Browse Source

修改 “完善个人信息” 接口

dev
qushutong 6 years ago
parent
commit
620a92d24c
  1. 1
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
  2. 40
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java
  3. 34
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java
  4. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
  5. 10
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

1
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* 对移动端开放

40
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyAuthenticationFailedEntity.java

@ -78,26 +78,6 @@ public class PartyAuthenticationFailedEntity extends BaseEpdcEntity {
*/
private Date registTime;
/**
* 街道名称
*/
private String streetName;
/**
* 街道ID
*/
private Long streetId;
/**
* 社区名称
*/
private String communityName;
/**
* 社区ID
*/
private Long communityId;
/**
* 网格名称
*/
@ -133,4 +113,24 @@ public class PartyAuthenticationFailedEntity extends BaseEpdcEntity {
*/
private String address;
/***
*所有部门名称
*/
private String allDeptNames;
/***
*所有部门ID
*/
private String allDeptIds;
/***
*父所有部门
*/
private String parentDeptNames;
/***
*父所有部门
*/
private String parentDeptIds;
}

34
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/PartyMembersEntity.java

@ -73,22 +73,6 @@ public class PartyMembersEntity extends BaseEpdcEntity {
* 注册时间
*/
private Date registTime;
/**
* 街道名称
*/
private String streetName;
/**
* 街道ID
*/
private long streetId;
/**
* 社区名称
*/
private String communityName;
/**
* 社区ID
*/
private long communityId;
/**
* 网格名称
*/
@ -101,5 +85,23 @@ public class PartyMembersEntity extends BaseEpdcEntity {
* 部门ID
*/
private long deptId;
/***
*所有部门名称
*/
private String allDeptNames;
/***
*所有部门ID
*/
private String allDeptIds;
/***
*父所有部门
*/
private String parentDeptNames;
/***
*父所有部门
*/
private String parentDeptIds;
}

2
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java

@ -162,8 +162,6 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
partyMembersEntity.setCadreFlag("0");
partyMembersEntity.setRegistFlag("0");
partyMembersEntity.setRegistTime(new Date());
partyMembersEntity.setStreetName(null);
partyMembersEntity.setCommunityName(null);
partyMembersEntity.setGridName(null);
}
insertBatch(partyMembersEntityList);

10
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@ -465,10 +465,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
String identityNo = userDto.getIdentityNo();
if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
PartyMembersEntity partyMembersEntity = new PartyMembersEntity();
partyMembersEntity.setStreetId(userGridRelation.getStreetId());
partyMembersEntity.setStreetName(userGridRelation.getStreet());
partyMembersEntity.setCommunityId(userGridRelation.getCommunityId());
partyMembersEntity.setCommunityName(userGridRelation.getCommunity());
//修改数据库结构
partyMembersEntity.setAllDeptNames(userGridRelation.getStreet()+"-"+userGridRelation.getCommunity()+"-"+userGridRelation.getGrid());
partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId()+","+userGridRelation.getCommunityId()+","+userGridRelation.getGridId());
partyMembersEntity.setParentDeptNames(userGridRelation.getStreet()+"-"+userGridRelation.getCommunity());
partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId()+","+userGridRelation.getCommunityId());
partyMembersEntity.setGridId(userGridRelation.getGridId());
partyMembersEntity.setGridName(userGridRelation.getGrid());
partyMembersEntity.setRegistFlag(YesOrNoEnum.YES.value());

Loading…
Cancel
Save