Commit 82a13441 by zhangxingmin

push

parent d878f8f1
...@@ -370,7 +370,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -370,7 +370,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Result<Appointment> addAppointmentData(ApiAppointmentInfoDto dto, public Result<Appointment> addAppointmentData(ApiAppointmentInfoDto dto,
Integer status, Integer status,
String isLegalBeneficiary) { Integer isLegalBeneficiary) {
if (Objects.isNull(dto)) { if (Objects.isNull(dto)) {
//为空设置,方便新建暂存公用方法 //为空设置,方便新建暂存公用方法
dto = new ApiAppointmentInfoDto(); dto = new ApiAppointmentInfoDto();
...@@ -666,7 +666,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -666,7 +666,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
//保险公司 //保险公司
follow.setInsuranceCompany(apiProductPlanMainInfoDto.getCompanyName()); follow.setInsuranceCompany(apiProductPlanMainInfoDto.getCompanyName());
//是否预缴 //是否预缴
follow.setIsPrepaid(Integer.parseInt(apiProductPlanMainInfoDto.getIsPrepay())); follow.setIsPrepaid(apiProductPlanMainInfoDto.getIsPrepay());
//供款年期 //供款年期
if (StringUtils.isNotBlank(apiProductPlanMainInfoDto.getIssueNumber())) { if (StringUtils.isNotBlank(apiProductPlanMainInfoDto.getIssueNumber())) {
follow.setPaymentTerm(apiProductPlanMainInfoDto.getIssueNumber()); follow.setPaymentTerm(apiProductPlanMainInfoDto.getIssueNumber());
...@@ -871,7 +871,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -871,7 +871,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
// 保险公司 // 保险公司
policy.setInsuranceCompany(productPlan.getCompanyName()); policy.setInsuranceCompany(productPlan.getCompanyName());
// 是否预缴 // 是否预缴
policy.setIsPrepaid(Integer.parseInt(productPlan.getIsPrepay())); policy.setIsPrepaid(productPlan.getIsPrepay());
// 转保声明选项(字典) // 转保声明选项(字典)
policy.setPolicyTransfer(policyTransfer); policy.setPolicyTransfer(policyTransfer);
...@@ -916,7 +916,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -916,7 +916,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Result<Appointment> editAppointmentData(ApiAppointmentInfoDto dto, Integer status,String isLegalBeneficiary) { public Result<Appointment> editAppointmentData(ApiAppointmentInfoDto dto, Integer status,Integer isLegalBeneficiary) {
if (Objects.isNull(dto)) { if (Objects.isNull(dto)) {
//预约信息对象不能为空 //预约信息对象不能为空
throw new BusinessException("预约信息对象不能为空"); throw new BusinessException("预约信息对象不能为空");
......
...@@ -12,7 +12,7 @@ public class ApiBeneficiaryInfoFzDto { ...@@ -12,7 +12,7 @@ public class ApiBeneficiaryInfoFzDto {
* 是否法定受益人 * 是否法定受益人
*/ */
@NotBlank(message = "受益人-是否法定受益人不能为空") @NotBlank(message = "受益人-是否法定受益人不能为空")
private String isLegalBeneficiary; private Integer isLegalBeneficiary;
/** /**
* 受益人列表信息 * 受益人列表信息
......
...@@ -552,11 +552,11 @@ public class ApiExcelImportAppointmentDto { ...@@ -552,11 +552,11 @@ public class ApiExcelImportAppointmentDto {
infoDto.setInitialPaymentMethod(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses, infoDto.setInitialPaymentMethod(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses,
DictTypeEnum.CSF_AP_FIRST_ISSUE.getItemValue(),dto.getPlanInitialPaymentMethod())); DictTypeEnum.CSF_AP_FIRST_ISSUE.getItemValue(),dto.getPlanInitialPaymentMethod()));
//是否参加递增保障权益->是否參加遞增保障權益/通脹加保權益 //是否参加递增保障权益->是否參加遞增保障權益/通脹加保權益
infoDto.setIsJoin(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses, infoDto.setIsJoin(Integer.parseInt(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses,
DictTypeEnum.SYS_NO_YES.getItemValue(),dto.getPlanIsJoin())); DictTypeEnum.SYS_NO_YES.getItemValue(),dto.getPlanIsJoin())));
//是否预缴保费->是否預繳保費 (如是,請填寫首期保費以外的剩餘保費)(是否预缴保费: 0-否, 1-是(字典)(产品计划信息表)) //是否预缴保费->是否預繳保費 (如是,請填寫首期保費以外的剩餘保費)(是否预缴保费: 0-否, 1-是(字典)(产品计划信息表))
infoDto.setIsPrepay(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses, infoDto.setIsPrepay(Integer.parseInt(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses,
DictTypeEnum.SYS_NO_YES.getItemValue(),dto.getPlanIsPrepay())); DictTypeEnum.SYS_NO_YES.getItemValue(),dto.getPlanIsPrepay())));
//付款频率 //付款频率
infoDto.setPaymentFrequency(dto.getPlanPaymentFrequency()); infoDto.setPaymentFrequency(dto.getPlanPaymentFrequency());
//供款年期 //供款年期
......
...@@ -121,7 +121,7 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy> ...@@ -121,7 +121,7 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
if (apiProductPlanMainInfoDto != null) { if (apiProductPlanMainInfoDto != null) {
BeanUtils.copyProperties(apiProductPlanMainInfoDto, policy, "policyBizId", "id"); BeanUtils.copyProperties(apiProductPlanMainInfoDto, policy, "policyBizId", "id");
policy.setPaymentPremium(apiProductPlanMainInfoDto.getEachIssuePremium()); policy.setPaymentPremium(apiProductPlanMainInfoDto.getEachIssuePremium());
policy.setIsPrepaid(Integer.parseInt(apiProductPlanMainInfoDto.getIsPrepay())); policy.setIsPrepaid(apiProductPlanMainInfoDto.getIsPrepay());
policy.setUpdateTime(now); policy.setUpdateTime(now);
// 更新保单 // 更新保单
this.updateById(policy); this.updateById(policy);
......
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