Browse Source

添加变更记录

dev
HAHA 3 years ago
parent
commit
ed52bb4010
  1. 2
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java
  2. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  3. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

2
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BindHomeFormDTO.java

@ -25,7 +25,9 @@ public class BindHomeFormDTO implements Serializable {
/** /**
* 用户id * 用户id
*/ */
@NotBlank(message = "客户id不能为空")
private String customerId; private String customerId;
@NotBlank(message = "人id不能为空")
private String userId; private String userId;
} }

2
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@ -1181,9 +1181,9 @@ public class IcResiUserController implements ResultDataResolver {
*/ */
@PostMapping("/bindHome") @PostMapping("/bindHome")
public Result bindHome(@RequestBody BindHomeFormDTO form, @LoginUser TokenDto tokenDto) { public Result bindHome(@RequestBody BindHomeFormDTO form, @LoginUser TokenDto tokenDto) {
ValidatorUtils.validateEntity(form);
form.setCustomerId(tokenDto.getCustomerId()); form.setCustomerId(tokenDto.getCustomerId());
form.setUserId(tokenDto.getUserId()); form.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(form);
icResiUserService.bindHome(form); icResiUserService.bindHome(form);
return new Result(); return new Result();
} }

5
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@ -2832,6 +2832,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
// 将人的信息放入ic_resi_user对象中 // 将人的信息放入ic_resi_user对象中
IcResiUserEntity entity = new IcResiUserEntity(); IcResiUserEntity entity = new IcResiUserEntity();
entity.setCustomerId(form.getCustomerId()); entity.setCustomerId(form.getCustomerId());
formDTO.setCustomerId(form.getCustomerId());
formDTO.setStaffId(form.getUserId());
// 进行日期转换 // 进行日期转换
if(residentDetailByIdCard.getBirthday() == null){ if(residentDetailByIdCard.getBirthday() == null){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取出生日期失败", "获取出生日期失败"); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取出生日期失败", "获取出生日期失败");
@ -2882,8 +2884,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
formDTO.setNewBuildingUnitId(houseInfo.getBuildingUnitId()); formDTO.setNewBuildingUnitId(houseInfo.getBuildingUnitId());
formDTO.setNewHouseId(houseInfo.getHomeId()); formDTO.setNewHouseId(houseInfo.getHomeId());
formDTO.setTransferTime(new java.util.Date()); formDTO.setTransferTime(new java.util.Date());
formDTO.setCustomerId(form.getCustomerId());
formDTO.setStaffId(form.getUserId());
if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) { if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) {
String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard()); String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());

Loading…
Cancel
Save