Commit bac86d73 authored by 李灿灿's avatar 李灿灿

feat:变更参保信息逻辑调整

parent 2829d317
...@@ -2139,8 +2139,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2139,8 +2139,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.eq(TInsuranceDetail::getPolicyStart, LocalDateUtil.parseLocalDate(success.getPolicyStart())) .eq(TInsuranceDetail::getPolicyStart, LocalDateUtil.parseLocalDate(success.getPolicyStart()))
.eq(TInsuranceDetail::getPolicyEnd, LocalDateUtil.parseLocalDate(success.getPolicyEnd())) .eq(TInsuranceDetail::getPolicyEnd, LocalDateUtil.parseLocalDate(success.getPolicyEnd()))
.eq(TInsuranceDetail::getBuyStandard,success.getBuyStandard()) .eq(TInsuranceDetail::getBuyStandard,success.getBuyStandard())
//排除替换类型
.ne(TInsuranceDetail::getBuyType,CommonConstants.FOUR_INT)
.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT) .eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
.orderByDesc(TInsuranceDetail::getUpdateTime) .orderByDesc(TInsuranceDetail::getUpdateTime)
.last(CommonConstants.LAST_ONE_SQL) .last(CommonConstants.LAST_ONE_SQL)
...@@ -2148,9 +2146,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2148,9 +2146,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceDetail oldDetail = new TInsuranceDetail(); TInsuranceDetail oldDetail = new TInsuranceDetail();
BeanCopyUtils.copyProperties(detail,oldDetail); BeanCopyUtils.copyProperties(detail,oldDetail);
detail.setPolicyStart(LocalDateUtil.parseLocalDate(success.getPolicyStartNew())); if (StringUtils.isNotBlank(success.getPolicyStartNew())){
detail.setPolicyEnd(LocalDateUtil.parseLocalDate(success.getPolicyEndNew())); detail.setPolicyStart(LocalDateUtil.parseLocalDate(success.getPolicyStartNew()));
detail.setBuyType(success.getBuyType()); }
if (StringUtils.isNotBlank(success.getPolicyEndNew())){
detail.setPolicyEnd(LocalDateUtil.parseLocalDate(success.getPolicyEndNew()));
}
if (Objects.nonNull(success.getBuyType())){
detail.setBuyType(success.getBuyType());
}
detailList.add(detail); detailList.add(detail);
//变更记录 //变更记录
tBusinessOperateService.saveModificationRecord(detail.getId(),oldDetail,detail,success.getReason()); tBusinessOperateService.saveModificationRecord(detail.getId(),oldDetail,detail,success.getReason());
...@@ -2208,41 +2212,41 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2208,41 +2212,41 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return R.failed(CommonConstants.PLEASE_LOG_IN); return R.failed(CommonConstants.PLEASE_LOG_IN);
} }
if (StringUtils.isBlank(param.getId())){ if (StringUtils.isBlank(param.getId())){
R.failed(InsurancesConstants.ID_IS_EMPTY); return R.failed(InsurancesConstants.ID_IS_EMPTY);
} }
if (StringUtils.isBlank(param.getPolicyStart()) && StringUtils.isBlank(param.getPolicyEnd()) && Objects.isNull(param.getBuyType())){ if (StringUtils.isBlank(param.getPolicyStart()) && StringUtils.isBlank(param.getPolicyEnd()) && Objects.isNull(param.getBuyType())){
R.failed(InsurancesConstants.CHOOSE_ONE_OF_THREE); return R.failed(InsurancesConstants.CHOOSE_ONE_OF_THREE);
} }
if (StringUtils.isNotBlank(param.getPolicyStart())){ if (StringUtils.isNotBlank(param.getPolicyStart())){
if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){ if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){
R.failed(InsurancesConstants.POLICY_START_NEW_PARSE_ERROR); return R.failed(InsurancesConstants.POLICY_START_NEW_PARSE_ERROR);
} }
} }
if (StringUtils.isNotBlank(param.getPolicyEnd())){ if (StringUtils.isNotBlank(param.getPolicyEnd())){
if(!LocalDateUtil.isDate(param.getPolicyEnd(),LocalDateUtil.NORM_DATE_PATTERN)){ if(!LocalDateUtil.isDate(param.getPolicyEnd(),LocalDateUtil.NORM_DATE_PATTERN)){
R.failed(InsurancesConstants.POLICY_END_NEW_PARSE_ERROR); return R.failed(InsurancesConstants.POLICY_END_NEW_PARSE_ERROR);
} }
} }
if (StringUtils.isNotBlank(param.getPolicyStart()) && StringUtils.isNotBlank(param.getPolicyEnd())){ if (StringUtils.isNotBlank(param.getPolicyStart()) && StringUtils.isNotBlank(param.getPolicyEnd())){
if (!LocalDateUtil.compareDate(param.getPolicyStart(),param.getPolicyEnd())){ if (!LocalDateUtil.compareDate(param.getPolicyStart(),param.getPolicyEnd())){
R.failed(InsurancesConstants.POLICY_START_NEW_SHOULD_LESS_THAN_POLICY_END_NEW); return R.failed(InsurancesConstants.POLICY_START_NEW_SHOULD_LESS_THAN_POLICY_END_NEW);
} }
} }
if (StringUtils.isBlank(param.getReason())){ if (StringUtils.isBlank(param.getReason())){
R.failed(InsurancesConstants.REASON_EMPTY); return R.failed(InsurancesConstants.REASON_EMPTY);
} }
if (StringUtils.isNotBlank(param.getReason()) && !ValidityUtil.validate50(param.getReason())){ if (StringUtils.isNotBlank(param.getReason()) && !ValidityUtil.validate50(param.getReason())){
R.failed(InsurancesConstants.REASON_MORE_THAN_50); return R.failed(InsurancesConstants.REASON_MORE_THAN_50);
} }
TInsuranceDetail byId = this.getById(param.getId()); TInsuranceDetail byId = this.getById(param.getId());
if (!Optional.ofNullable(byId).isPresent()){ if (!Optional.ofNullable(byId).isPresent()){
R.failed(InsurancesConstants.NOT_FOUND_INSURANCE_RECORD); return R.failed(InsurancesConstants.NOT_FOUND_INSURANCE_RECORD);
} }
if (byId.getBuyType() == CommonConstants.FOUR_INT){ if (byId.getBuyType() == CommonConstants.FOUR_INT && param.getBuyType() != CommonConstants.FOUR_INT){
R.failed(InsurancesConstants.REPLACE_NOT_ALLOW); return R.failed(InsurancesConstants.REPLACE_NOT_ALLOW);
} }
if (byId.getBuyHandleStatus() != CommonConstants.THREE_INT && byId.getBuyHandleStatus() != CommonConstants.FIVE_INT){ if (byId.getBuyHandleStatus() != CommonConstants.THREE_INT && byId.getBuyHandleStatus() != CommonConstants.FIVE_INT){
R.failed(InsurancesConstants.CURRENT_STATUS_NOT_CHANGE_INSURANCE_RECORD); return R.failed(InsurancesConstants.CURRENT_STATUS_NOT_CHANGE_INSURANCE_RECORD);
} }
TInsuranceDetail old = new TInsuranceDetail(); TInsuranceDetail old = new TInsuranceDetail();
BeanCopyUtils.copyProperties(byId,old); BeanCopyUtils.copyProperties(byId,old);
...@@ -3745,8 +3749,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3745,8 +3749,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
.eq(TInsuranceDetail::getPolicyStart, LocalDateUtil.parseLocalDate(param.getPolicyStart())) .eq(TInsuranceDetail::getPolicyStart, LocalDateUtil.parseLocalDate(param.getPolicyStart()))
.eq(TInsuranceDetail::getPolicyEnd, LocalDateUtil.parseLocalDate(param.getPolicyEnd())) .eq(TInsuranceDetail::getPolicyEnd, LocalDateUtil.parseLocalDate(param.getPolicyEnd()))
.eq(TInsuranceDetail::getBuyStandard,param.getBuyStandard()) .eq(TInsuranceDetail::getBuyStandard,param.getBuyStandard())
//排除替换类型
.ne(TInsuranceDetail::getBuyType,CommonConstants.FOUR_INT)
.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT) .eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
.orderByDesc(TInsuranceDetail::getUpdateTime) .orderByDesc(TInsuranceDetail::getUpdateTime)
.last(CommonConstants.LAST_ONE_SQL) .last(CommonConstants.LAST_ONE_SQL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment