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

出生管理

dev
zhaoqifeng 3 years ago
parent
aea88e3bc9
commit
c901d7a2dd
5 changed files with 24 additions and 19 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. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java
  2. 1
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
  3. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
  4. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java
  5. 28
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcBirthRecordServiceImpl.java

4
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java
View File

@ -2,6 +2,8 @@ package com.epmet.commons.tools.enums;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import java.util.Objects;
public enum GenderEnum {
MAN("1", "男"),
WOMAN("2", "女"),
@ -19,7 +21,7 @@ public enum GenderEnum {
public static String getName(String code) {
GenderEnum[] genderEnums = values();
for (GenderEnum genderEnum : genderEnums) {
if (genderEnum.getCode() == code) {
if (Objects.equals(genderEnum.getCode(), code)) {
return genderEnum.getName();
}
}

1
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
View File

@ -137,7 +137,6 @@ public class IcBirthRecordDTO implements Serializable {
/**
* 是否更新居民信息0否 1是
*/
@JsonIgnore
private String isReplace;
/**

2
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcBirthRecordController.java
View File

@ -85,7 +85,7 @@ public class IcBirthRecordController {
return new Result();
}
@GetMapping("export")
@PostMapping("export")
public void export(@LoginUser TokenDto tokenDto, @RequestBody BirthRecordFormDTO formDTO, HttpServletResponse response) throws Exception {
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());

8
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcBirthRecordExcel.java
View File

@ -16,7 +16,7 @@ import lombok.Data;
@Data
public class IcBirthRecordExcel {
@ColumnWidth(5)
@ColumnWidth(10)
@ExcelProperty(value = "序号",order = 1)
private Integer index;
@ -40,7 +40,7 @@ public class IcBirthRecordExcel {
@ExcelProperty(value = "身份证号",order = 1)
private String idCard;
@ColumnWidth(5)
@ColumnWidth(10)
@ExcelProperty(value = "性别",order = 1)
private String gender;
@ -52,11 +52,11 @@ public class IcBirthRecordExcel {
@ExcelProperty(value = "出生地",order = 1)
private String birthplace;
@ColumnWidth(20)
@ColumnWidth(30)
@ExcelProperty(value = "出生人的父/母姓名",order = 1)
private String parentName;
@ColumnWidth(5)
@ColumnWidth(10)
@ExcelProperty(value = "胎次",order = 1)
private Integer count;

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

@ -144,7 +144,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
userEntity.setSubStatus(IcResiUserSubStatusEnum.BIRTH.getSubStatus());
//判断是否有所属组织，如果有，判断是否属于当前组织，没有的话则直接新增
if (StringUtils.isNotEmpty(sync.getAgencyId())) {
if (StringUtils.isNotEmpty(sync.getIcResiUserId())) {
userEntity.setId(sync.getIcResiUserId());
if (staffInfo.getAgencyId().equals(sync.getAgencyId())) {
//组织相等的情况
@ -158,6 +158,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
} else if (NumConstant.ONE_STR.equals(dto.getIsReplace())) {
//更新居民信息
icResiUserDao.updateById(userEntity);
extracted(tokenDto, dto, staffInfo, sync, "change");
}
} else {
//房屋信息一致
@ -169,21 +170,22 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
//更新居民信息
icResiUserDao.updateById(userEntity);
//迁入记录
extracted(tokenDto, dto, staffInfo, sync);
extracted(tokenDto, dto, staffInfo, sync, "in");
}
} else {
//组织不相等的情况
//更新居民信息
icResiUserDao.updateById(userEntity);
//迁入记录
extracted(tokenDto, dto, staffInfo, sync);
extracted(tokenDto, dto, staffInfo, sync, "in");
}
} else {
//添加居民信息
icResiUserDao.insert(userEntity);
//迁入记录
extracted(tokenDto, dto, staffInfo, sync);
sync.setIcResiUserId(userEntity.getId());
extracted(tokenDto, dto, staffInfo, sync, "add");
}
}
@ -224,7 +226,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
throw new EpmetException("已补充到居民信息");
}
//是否补充居民信息
SyncResiResDTO sync = icResiUserService.checkUser(tokenDto.getCustomerId(), dto.getIdCard(), staffInfo.getAgencyId());
SyncResiResDTO sync = icResiUserService.checkUser(tokenDto.getCustomerId(), record.getIdCard(), staffInfo.getAgencyId());
if (NumConstant.ONE_STR.equals(dto.getIsCheck())) {
//判断是否可迁入
if (!sync.getMoveInstatus()) {
@ -240,13 +242,13 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
userEntity.setSubStatus("11");
//判断是否有所属组织，如果有，判断是否属于当前组织，没有的话则直接新增
if (StringUtils.isNotEmpty(sync.getAgencyId())) {
if (StringUtils.isNotEmpty(sync.getIcResiUserId())) {
userEntity.setId(sync.getIcResiUserId());
if (staffInfo.getAgencyId().equals(sync.getAgencyId())) {
//组织相等的情况
if (NumConstant.ZERO_STR.equals(sync.getStatus())) {
//正常状态
if (!dto.getHomeId().equals(sync.getResiHomeId())) {
if (!record.getHomeId().equals(sync.getResiHomeId())) {
//房屋信息不一致
//是否更新 为空，返回确认消息
if (StringUtils.isBlank(dto.getIsReplace())) {
@ -254,6 +256,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
} else if (NumConstant.ONE_STR.equals(dto.getIsReplace())) {
//更新居民信息
icResiUserDao.updateById(userEntity);
extracted(tokenDto, ConvertUtils.sourceToTarget(record, IcBirthRecordDTO.class), staffInfo, sync, "change");
}
} else {
//房屋信息一致
@ -265,21 +268,22 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
//更新居民信息
icResiUserDao.updateById(userEntity);
//迁入记录
extracted(tokenDto, ConvertUtils.sourceToTarget(record, IcBirthRecordDTO.class), staffInfo, sync);
extracted(tokenDto, ConvertUtils.sourceToTarget(record, IcBirthRecordDTO.class), staffInfo, sync, "in");
}
} else {
//组织不相等的情况
//更新居民信息
icResiUserDao.updateById(userEntity);
//迁入记录
extracted(tokenDto, ConvertUtils.sourceToTarget(record, IcBirthRecordDTO.class), staffInfo, sync);
extracted(tokenDto, ConvertUtils.sourceToTarget(record, IcBirthRecordDTO.class), staffInfo, sync, "in ");
}
} else {
//添加居民信息
icResiUserDao.insert(userEntity);
//迁入记录
extracted(tokenDto, dto, staffInfo, sync);
sync.setIcResiUserId(userEntity.getId());
extracted(tokenDto, ConvertUtils.sourceToTarget(record, IcBirthRecordDTO.class), staffInfo, sync, "add");
}
}
@ -351,7 +355,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
* @Author zhaoqifeng
* @Date 2022/5/11 9:15
*/
private void extracted(TokenDto tokenDto, IcBirthRecordDTO dto, CustomerStaffInfoCacheResult staffInfo, SyncResiResDTO sync) {
private void extracted(TokenDto tokenDto, IcBirthRecordDTO dto, CustomerStaffInfoCacheResult staffInfo, SyncResiResDTO sync, String origin) {
IcResiUserTransferFormDTO transfer = new IcResiUserTransferFormDTO();
transfer.setCustomerId(tokenDto.getCustomerId());
transfer.setStaffId(tokenDto.getUserId());
@ -365,7 +369,7 @@ public class IcBirthRecordServiceImpl extends BaseServiceImpl<IcBirthRecordDao,
transfer.setNewHouseId(dto.getHomeId());
transfer.setTransferTime(new Date());
transfer.setReason("出生登记");
transfer.setOrigin("birth");
transfer.setOrigin(origin);
icUserTransferRecordService.moveResi(transfer);
}

Write Preview
Loading…
Cancel
Save