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

Feature licancan

See merge request !289

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -112,6 +112,10 @@ public class InsurancesConstants {
 	 * 未找到符合条件的参保记录
 	 */
 	public static final String NOT_FOUND_INSURANCE_RECORD = "未找到符合条件的参保记录";
+	/**
+	 * 当前投保状态无法变更投保记录
+	 */
+	public static final String CURRENT_STATUS_NOT_CHANGE_INSURANCE_RECORD = "当前投保状态无法变更投保记录";
 	/**
 	 * 当前投保状态无法登记发票号
 	 */
@@ -150,9 +154,9 @@ public class InsurancesConstants {
 	 */
 	public static final String REPLACE_IS_EXIST = "替换员工投保记录已存在";
 	/**
-	 * 替换类型不能修改
+	 * 替换投保不允许变更投保类型
 	 */
-	public static final String REPLACE_NOT_ALLOW = "替换类型不能修改";
+	public static final String REPLACE_NOT_ALLOW = "替换投保不允许变更投保类型";
 	/**
 	 * 当前记录是待投保，无法替换
 	 */
@@ -298,9 +302,9 @@ public class InsurancesConstants {
 	 */
 	public static final String POLICY_START_SHOULD_LESS_THAN_POLICY_END = "保单结束时间需要大于保单开始时间";
 	/**
-	 * 保单开始时间需早于保单结束时间
+	 * 变更后的保单开始时间需早于保单结束时间
 	 */
-	public static final String POLICY_START_NEW_SHOULD_LESS_THAN_POLICY_END_NEW = "保单开始时间需早于保单结束时间";
+	public static final String POLICY_START_NEW_SHOULD_LESS_THAN_POLICY_END_NEW = "变更后的保单开始时间需早于保单结束时间";
 	/**
 	 * 保单起止时间不能超过365天
 	 */
@@ -401,6 +405,10 @@ public class InsurancesConstants {
 	 * 变更原因不能为空
 	 */
 	public static final String REASON_EMPTY = "变更原因不能为空";
+	/**
+	 * 变更原因超过50字符限制
+	 */
+	public static final String REASON_MORE_THAN_50 = "变更原因超过50字符限制";
 	/**
 	 * 发票号长度超过50字符限制
 	 */
@@ -418,9 +426,9 @@ public class InsurancesConstants {
 	 */
 	public static final String BUY_TYPE_FOUR_NOT_REGISTERED= "替换类型无法登记保单保费";
 	/**
-	 * 变更后投保类型错误
+	 * 变更后投保类型只能填写新增、批增
 	 */
-	public static final String BUY_TYPE_ERROR_NEW = "变更后投保类型错误";
+	public static final String BUY_TYPE_ERROR_NEW = "变更后投保类型只能填写新增、批增";
 	/**
 	 * 商险待投保，无法登记保单保费
 	 */

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

@@ -2231,15 +2231,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (StringUtils.isBlank(param.getReason())){
 			R.failed(InsurancesConstants.REASON_EMPTY);
 		}
+		if (StringUtils.isNotBlank(param.getReason()) && !ValidityUtil.validate50(param.getReason())){
+			R.failed(InsurancesConstants.REASON_MORE_THAN_50);
+		}
 		TInsuranceDetail byId = this.getById(param.getId());
 		if (!Optional.ofNullable(byId).isPresent()){
-			R.failed(InsurancesConstants.DATA_IS_NOT_EXIST);
+			R.failed(InsurancesConstants.NOT_FOUND_INSURANCE_RECORD);
 		}
 		if (byId.getBuyType() == CommonConstants.FOUR_INT){
 			R.failed(InsurancesConstants.REPLACE_NOT_ALLOW);
 		}
-		if (byId.getBuyHandleStatus() != CommonConstants.THREE_INT){
-			R.failed(InsurancesConstants.BUY_HANDLE_STATUS_NOT_THREE);
+		if (byId.getBuyHandleStatus() != CommonConstants.THREE_INT && byId.getBuyHandleStatus() != CommonConstants.FIVE_INT){
+			R.failed(InsurancesConstants.CURRENT_STATUS_NOT_CHANGE_INSURANCE_RECORD);
 		}
 		TInsuranceDetail old = new TInsuranceDetail();
 		BeanCopyUtils.copyProperties(byId,old);
@@ -3729,6 +3732,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				param.setErrorMessage(InsurancesConstants.REASON_EMPTY);
 				continue;
 			}
+			if (StringUtils.isNotBlank(param.getReason()) && !ValidityUtil.validate50(param.getReason())){
+				param.setErrorMessage(InsurancesConstants.REASON_MORE_THAN_50);
+				continue;
+			}
 			//查数据是否存在：姓名 + 身份证号 + 保险公司 + 险种名称 + 保单开始时间 + 保单结束时间 + 购买标准
 			TInsuranceDetail detail = this.baseMapper.selectOne(Wrappers.<TInsuranceDetail>query().lambda()
 					.eq(TInsuranceDetail::getEmpName, param.getEmpName())
@@ -3745,12 +3752,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					.last(CommonConstants.LAST_ONE_SQL)
 			);
 			if (!Optional.ofNullable(detail).isPresent()){
-				param.setErrorMessage(InsurancesConstants.DATA_IS_NOT_EXIST);
+				param.setErrorMessage(InsurancesConstants.NOT_FOUND_INSURANCE_RECORD);
 				continue;
 			}else {
-				//判断是否是已投保状态
-				if (detail.getBuyHandleStatus() != CommonConstants.THREE_INT){
-					param.setErrorMessage(InsurancesConstants.BUY_HANDLE_STATUS_NOT_THREE);
+				//判断是否是已投保状态或已减员
+				if (detail.getBuyHandleStatus() != CommonConstants.THREE_INT && detail.getBuyHandleStatus() != CommonConstants.FIVE_INT){
+					param.setErrorMessage(InsurancesConstants.CURRENT_STATUS_NOT_CHANGE_INSURANCE_RECORD);
 					continue;
 				}
 			}