Merge branch 'feature-licancan' into 'feature/insurance-1.3.0'

Feature licancan

See merge request !292

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceExportListVO.java

@@ -6,7 +6,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
@@ -153,12 +152,6 @@ public class InsuranceExportListVO implements Serializable {
 	@Schema(description = "身故或残疾额度")
 	private String dieDisableQuota;
 
-	/**
-	 * 实际保费
-	 */
-	@Schema(description = "实际保费")
-	private BigDecimal actualPremium;
-
 	/**
 	 * 结算月
 	 */

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -2139,8 +2139,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						.eq(TInsuranceDetail::getPolicyStart, LocalDateUtil.parseLocalDate(success.getPolicyStart()))
 						.eq(TInsuranceDetail::getPolicyEnd, LocalDateUtil.parseLocalDate(success.getPolicyEnd()))
 						.eq(TInsuranceDetail::getBuyStandard,success.getBuyStandard())
-						//排除替换类型
-						.ne(TInsuranceDetail::getBuyType,CommonConstants.FOUR_INT)
 						.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
 						.orderByDesc(TInsuranceDetail::getUpdateTime)
 						.last(CommonConstants.LAST_ONE_SQL)
@@ -2148,9 +2146,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 
 				TInsuranceDetail oldDetail = new TInsuranceDetail();
 				BeanCopyUtils.copyProperties(detail,oldDetail);
+				if (StringUtils.isNotBlank(success.getPolicyStartNew())){
 					detail.setPolicyStart(LocalDateUtil.parseLocalDate(success.getPolicyStartNew()));
+				}
+				if (StringUtils.isNotBlank(success.getPolicyEndNew())){
 					detail.setPolicyEnd(LocalDateUtil.parseLocalDate(success.getPolicyEndNew()));
+				}
+				if (Objects.nonNull(success.getBuyType())){
 					detail.setBuyType(success.getBuyType());
+				}
 				detailList.add(detail);
 				//变更记录
 				tBusinessOperateService.saveModificationRecord(detail.getId(),oldDetail,detail,success.getReason());
@@ -2208,41 +2212,41 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
 		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())){
-			R.failed(InsurancesConstants.CHOOSE_ONE_OF_THREE);
+			return R.failed(InsurancesConstants.CHOOSE_ONE_OF_THREE);
 		}
 		if (StringUtils.isNotBlank(param.getPolicyStart())){
 			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(!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 (!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())){
-			R.failed(InsurancesConstants.REASON_EMPTY);
+			return R.failed(InsurancesConstants.REASON_EMPTY);
 		}
 		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());
 		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){
-			R.failed(InsurancesConstants.REPLACE_NOT_ALLOW);
+		if (byId.getBuyType() == CommonConstants.FOUR_INT && param.getBuyType() != CommonConstants.FOUR_INT){
+			return R.failed(InsurancesConstants.REPLACE_NOT_ALLOW);
 		}
 		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();
 		BeanCopyUtils.copyProperties(byId,old);
@@ -3745,8 +3749,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					.eq(TInsuranceDetail::getPolicyStart, LocalDateUtil.parseLocalDate(param.getPolicyStart()))
 					.eq(TInsuranceDetail::getPolicyEnd, LocalDateUtil.parseLocalDate(param.getPolicyEnd()))
 					.eq(TInsuranceDetail::getBuyStandard,param.getBuyStandard())
-					//排除替换类型
-					.ne(TInsuranceDetail::getBuyType,CommonConstants.FOUR_INT)
 					.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
 					.orderByDesc(TInsuranceDetail::getUpdateTime)
 					.last(CommonConstants.LAST_ONE_SQL)

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsurancePolicyServiceImpl.java

@@ -118,6 +118,12 @@ public class TInsurancePolicyServiceImpl extends ServiceImpl<TInsurancePolicyMap
 					.last(CommonConstants.LAST_ONE_SQL));
 			if (!Optional.ofNullable(one).isPresent()){
 				this.save(policy);
+
+				//第一次新增插入变更记录表为insert，前端会将insert渲染为批量导入
+				TBusinessOperate operate = new TBusinessOperate();
+				operate.setBusinessId(policy.getId());
+				operate.setDifferenceInfo("insert");
+				tBusinessOperateService.save(operate);
 			}
 		}
 		return R.ok();