"feature-zhaJi:优化减员办理时的提示语句"

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

@@ -810,7 +810,7 @@ public class InsurancesConstants {
 	/**
 	 * 减员退回的办理意见不能为空
 	 */
-	public static final String REFUND_MESSAGE_IS_EMPTY = "减员退回的办理意见不能为空";
+	public static final String REFUND_MESSAGE_IS_EMPTY = "办理失败意见不能为空";
 
 	/**
 	 * 	该保单信息已被更新为减员退回
@@ -844,12 +844,12 @@ public class InsurancesConstants {
 	/**
 	 * 办理结果类型错误
 	 */
-	public static final String HAND_RESULT_ERROR = "办理结果类型错误";
+	public static final String HAND_RESULT_ERROR = "办理结果请填写成功或者失败";
 
 	/**
 	 * 办理结果为空
 	 */
-	public static final String HAND_RESULT_IS_EMPTY = "办理结果为空";
+	public static final String HAND_RESULT_IS_EMPTY = "办理结果不能为空";
 
 	/**
 	 * 无该条数据的操作权限
@@ -885,8 +885,10 @@ public class InsurancesConstants {
 	 */
 	public static final String REFUND_STATUS_FOUR_HANDLE_ERROR = "当前为减员退回状态，不可办理";
 
-
-
+	/**
+	 * 办理意见长度超过50字符限制
+	 */
+	public static final String HAND_REMARK_NOT_MORE_THAN_50 = "办理意见长度超过50字符限制";
 
 
 

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

@@ -4146,6 +4146,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			if(StringUtils.isNotBlank(remark) && ValidityUtil.validate50(remark)){
+				param.setErrorMessage(InsurancesConstants.HAND_REMARK_NOT_MORE_THAN_50);
+				errorList.add(param);
+				continue;
+			}
 			//员工姓名
 			String empName = param.getEmpName();
 			if(StringUtils.isBlank(empName)){
@@ -4289,10 +4294,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 			param.setId(detailId);
-			successList.add(param);
+			boolean b = successList.stream().anyMatch(
+					u -> u.getEmpName().equals(param.getEmpName())
+							&& u.getEmpIdcardNo().equals(param.getEmpIdcardNo())
+							&& u.getInsuranceCompanyName().equals(param.getInsuranceCompanyName())
+							&& u.getInsuranceTypeName().equals(param.getInsuranceTypeName())
+							&& u.getPolicyStart().equals(param.getPolicyStart())
+							&& u.getPolicyEnd().equals(param.getPolicyEnd())
+							&& u.getBuyStandard().equals(param.getBuyStandard())
+			);
+			if(!b){
+				successList.add(param);
+			}
 		}
-		map.put("errorList",errorList);
 		map.put("successList",successList);
+		map.put("errorList",errorList);
 		return map;
 	}