|
|
@ -90,7 +90,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void add(AddIcNatFormDTO formDTO) { |
|
|
|
//0.先根据身份证号和检查时间校验数据是否存在
|
|
|
|
//0.先根据身份证号和检查时间以及检测结果校验数据是否存在
|
|
|
|
IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), null, formDTO.getIdCard(), DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE), formDTO.getNatResult()); |
|
|
|
if (null != icNatDTO) { |
|
|
|
throw new RenException(EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getCode(), EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getMsg()); |
|
|
@ -203,12 +203,12 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void edit(AddIcNatFormDTO formDTO) { |
|
|
|
//0.先根据身份证号和检测时间校验除当前数据是否还存在相同数据
|
|
|
|
//0.先根据身份证号和检测时间以及检测结果校验除当前数据是否还存在相同数据
|
|
|
|
IcNatDTO icNatDTO = baseDao.getNatDTO(formDTO.getCustomerId(), formDTO.getIcNatId(), formDTO.getIdCard(), DateUtils.format(formDTO.getNatTime(), DateUtils.DATE_TIME_PATTERN_END_WITH_MINUTE), formDTO.getNatResult()); |
|
|
|
if (null != icNatDTO) { |
|
|
|
throw new RenException(EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getCode(), EpmetErrorCode.IC_NAT_IDCARD_NATTIME.getMsg()); |
|
|
|
} |
|
|
|
//1.更新核酸记录表数据
|
|
|
|
//1.更新核酸记录基础信息表数据
|
|
|
|
IcNatEntity entity = ConvertUtils.sourceToTarget(formDTO, IcNatEntity.class); |
|
|
|
entity.setId(formDTO.getIcNatId()); |
|
|
|
if (!updateById(entity)) { |
|
|
@ -216,6 +216,17 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp |
|
|
|
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "核酸记录修改失败"); |
|
|
|
} |
|
|
|
|
|
|
|
//2.更新与组织的关系表数据
|
|
|
|
AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); |
|
|
|
if (null == agencyInfo) { |
|
|
|
throw new RenException(String.format("获取组织缓存信息失败%s", formDTO.getAgencyId())); |
|
|
|
} |
|
|
|
LambdaQueryWrapper<IcNatRelationEntity> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
wrapper.eq(IcNatRelationEntity::getIcNatId, formDTO.getIcNatId()); |
|
|
|
IcNatRelationEntity relationEntity = ConvertUtils.sourceToTarget(formDTO, IcNatRelationEntity.class); |
|
|
|
relationEntity.setPids(StringUtils.isNotBlank(agencyInfo.getPids()) ? agencyInfo.getPids() + ":" + formDTO.getAgencyId() : agencyInfo.getPids()); |
|
|
|
icNatRelationDao.update(relationEntity, wrapper); |
|
|
|
|
|
|
|
//3.新增通知表信息
|
|
|
|
if (CollectionUtils.isNotEmpty(formDTO.getChannel())) { |
|
|
|
SendNoticeFormDTO dto = new SendNoticeFormDTO(); |
|
|
@ -229,6 +240,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp |
|
|
|
dto.setStaffId(formDTO.getStaffId()); |
|
|
|
icNoticeService.sendNotice(dto); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|