elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'remotes/origin/dev_icresiuser_pids' into 市北master 

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
feature/teamB_zz_wgh
jianjun 3 years ago
parent
298b5c8d74 2f3f773199
commit
be96f08a0f
5 changed files with 56 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
  2. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
  3. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
  4. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
  5. 35
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

7
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
View File

@ -451,4 +451,11 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
List<String> getUserId(String icResiUserId);
List<IcResiUserDTO> getListIcResiUserDTO(List<String> icResiUserIdList);
/**
* desc:设置居民的pids pids为agencyId的pids+agencyId 即包含组织本身 如果pids 为空则pids 为agencyId
* @param entity
*/
void setIcResiUserPids(IcResiUserEntity entity);
}

5
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java
View File

@ -159,11 +159,13 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
} else if (NumConstant.ONE_STR.equals(dto.getIsReplace())) {
extracted(tokenDto, dto, staffInfo, sync, "change");
//更新居民信息
icResiUserService.setIcResiUserPids(userEntity);
icResiUserDao.updateById(userEntity);
}
} else {
//房屋信息一致
//更新居民信息
icResiUserService.setIcResiUserPids(userEntity);
icResiUserDao.updateById(userEntity);
}
} else {
@ -171,6 +173,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
//迁入记录
extracted(tokenDto, dto, staffInfo, sync, "in");
//更新居民信息
icResiUserService.setIcResiUserPids(userEntity);
icResiUserDao.updateById(userEntity);
}
} else {
@ -178,10 +181,12 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
//迁入记录
extracted(tokenDto, dto, staffInfo, sync, "in");
//更新居民信息
icResiUserService.setIcResiUserPids(userEntity);
icResiUserDao.updateById(userEntity);
}
} else {
//添加居民信息
icResiUserService.setIcResiUserPids(userEntity);
icResiUserDao.insert(userEntity);
//迁入记录
sync.setIcResiUserId(userEntity.getId());

4
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcMoveInRecordServiceImpl.java
View File

@ -178,6 +178,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
change.setIcUserId(entity.getId());
//先加记录，再修改，否则找不到原房屋
icUserTransferRecordService.moveResi(change);
icResiUserService.setIcResiUserPids(entity);
icResiUserService.updateById(entity);
} else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId()) && "1".equals(resiDTO.getStatus())) {
//4-2.本社区下游离状态居民【更新居民信息，插入调动记录，生成变更记录、变更明细】
@ -186,6 +187,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
change.setIcUserId(entity.getId());
change.setOrigin("in");
icUserTransferRecordService.moveResi(change);
icResiUserService.setIcResiUserPids(entity);
icResiUserService.updateById(entity);
} else if (StringUtils.isNotBlank(resiDTO.getResiAgencyId()) && !staffInfo.getAgencyId().equals(resiDTO.getResiAgencyId())) {
//4-3.非本社区下游离状态居民【更新居民信息，插入调动记录，生成变更记录、变更明细】
@ -196,6 +198,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
change.setIcUserId(entity.getId());
change.setOrigin("in");
icUserTransferRecordService.moveResi(change);
icResiUserService.setIcResiUserPids(entity);
icResiUserService.updateById(entity);
} else if (StringUtils.isBlank(resiDTO.getResiAgencyId())) {
//4-4.客户下不存在的居民(新数据)【新增居民信息，生成变更记录（新增）、不生成变更明细(因为十八类默认都是否)】
@ -203,6 +206,7 @@ public class IcMoveInRecordServiceImpl extends BaseServiceImpl<IcMoveInRecordDao
entity.setPids(staffInfo.getAgencyPIds());
//迁入管理-新增的居民，存储03
entity.setSubStatus(IcResiUserSubStatusEnum.MOVE_IN.getSubStatus());
icResiUserService.setIcResiUserPids(entity);
icResiUserService.insert(entity);
change.setOrigin("add");
change.setIcUserId(entity.getId());

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
View File

@ -515,7 +515,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
AgencyInfoCache agencyInfo = getAgencyInfo(gridId);
if (agencyInfo != null) {
columnAndValues.put("AGENCY_ID", agencyInfo.getId());
columnAndValues.put("PIDS", agencyInfo.getPids());
String agencyPath = agencyInfo.getPids();
if (StringUtils.isBlank(agencyInfo.getPids())){
agencyPath = agencyInfo.getId();
}else if (!agencyPath.contains(agencyInfo.getId())){
agencyPath = agencyInfo.getPids()+StrConstant.COLON +agencyInfo.getId();
}
columnAndValues.put("PIDS", agencyPath);
} else {
String msg = String.format("【居民信息导入】根据网格查询组织失败，网格ID:%s", gridId);
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);

35
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
View File

@ -21,6 +21,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.epmet.bean.ResiExportBaseInfoData;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.*;
@ -213,7 +214,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
//1.先往主表新增数据
//主表Id
String resiUserId = UUID.randomUUID().toString().replaceAll("-", "");
String resiUserId = IdWorker.getIdStr();
String name = "";
LinkedHashMap<String, String> map = new LinkedHashMap<>();
com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO partyMemberDTO = new com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO();
@ -240,6 +241,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
if (!map.containsKey("AGENCY_ID")) {
throw new RenException("新增居民信息--入参AGENCY_ID为空");
}
if (!map.containsKey(UserConstant.GRID_ID)) {
throw new RenException("新增居民信息--入参GRID_ID为空");
}
//2021.11.25 新增需求 客户下身份证号唯一 start
if (map.containsKey("ID_CARD")) {
IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(map.get("ID_CARD"), tokenDto.getCustomerId());
@ -266,7 +270,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
String agencyId = map.get("AGENCY_ID");
Result<CustomerAgencyDTO> result = govOrgOpenFeignClient.getAgencyById(agencyId);
if (result.success() && null != result.getData()) {
map.put("pids", result.getData().getPids());
//pids拼上 agencyId
String pids = result.getData().getPids();
if (StringUtils.isBlank(pids)) {
pids = agencyId;
} else if (!pids.contains(agencyId)){
pids = pids + StrConstant.COLON + agencyId;
}
map.put("pids", pids);
} else {
throw new RenException(String.format("新增居民信息-根据agencyId查询组织信息失败，agencyId->%s", agencyId));
}
@ -2033,6 +2044,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class);
entity.setIsTenant(NumConstant.ONE_STR);
entity.setIsFloating(NumConstant.ONE_STR);
//pids 改为 拼接上自身
this.setIcResiUserPids(entity);
insert(entity);
resiUserId = entity.getId();
// 变更记录表和变更记录明细表新增数据
@ -2380,6 +2393,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
dto.setHomeId(user.getHomeId());
IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
this.setIcResiUserPids(entity);
insert(entity);
return new Result().ok("新增成功");
@ -2411,6 +2425,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
}
IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
this.setIcResiUserPids(entity);
entity.setId(dto.getIcResiUserId());
updateById(entity);
return new Result().ok("修改成功");
@ -2457,6 +2472,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
}
IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
this.setIcResiUserPids(entity);
insert(entity);
return new Result().ok("新增成功");
@ -2751,4 +2767,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
public List<String> getAllUserIds(String idCard, String customerId) {
return baseDao.getAllUserIds(idCard, customerId);
}
/**
* desc:设置居民的pids pids为agencyId的pids+agencyId 即包含组织本身 如果pids 为空则pids 为agencyId
* @param entity
*/
@Override
public void setIcResiUserPids(IcResiUserEntity entity) {
String agencyPath = entity.getPids();
if (StringUtils.isBlank(agencyPath)) {
agencyPath = entity.getAgencyId();
} else if (!agencyPath.contains(entity.getAgencyId())) {
agencyPath = agencyPath + StrConstant.COLON + entity.getAgencyId();
}
entity.setPids(agencyPath);
}
}

Write Preview
Loading…
Cancel
Save