20221107 要求允许同一个人同时存在多个不同的在保信息(去掉时间区间校验)2

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

@@ -2235,8 +2235,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				InsuranceBatchParam repeat = distinctList.get(j);
 				if (param.getEmpName().equals(repeat.getEmpName())
 						&& param.getEmpIdcardNo().equals(repeat.getEmpIdcardNo())
+						&& param.getPolicyNo().equals(repeat.getPolicyNo())
 						&& param.getInsuranceCompanyName().equals(repeat.getInsuranceCompanyName())
 						&& param.getInsuranceTypeName().equals(repeat.getInsuranceTypeName())
+						&& param.getBuyStandard().equals(repeat.getBuyStandard())
 						&& i != j){
 					param.setErrorMessage(InsurancesConstants.DUPLICATE_DATA_ERROR);
 					listResult.add(param);
@@ -2463,8 +2465,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			TInsuranceDetail insuranceDetail = this.baseMapper.selectOne(Wrappers.<TInsuranceDetail>query().lambda()
 					.eq(TInsuranceDetail::getEmpName, param.getEmpName())
 					.eq(TInsuranceDetail::getEmpIdcardNo, param.getEmpIdcardNo())
+					.eq(TInsuranceDetail::getPolicyNo,param.getPolicyNo())
 					.eq(TInsuranceDetail::getInsuranceCompanyName, param.getInsuranceCompanyName())
 					.eq(TInsuranceDetail::getInsuranceTypeName, param.getInsuranceTypeName())
+					.eq(TInsuranceDetail::getBuyStandard, param.getBuyStandard())
 					.notIn(TInsuranceDetail::getBuyHandleStatus, setRStatus)
 					.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
 					//有效