Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request !260

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

@@ -67,6 +67,12 @@ public class InsuranceRefundCheck implements Serializable {
 	@Schema(description = "保单结束日期")
 	private String policyEnd;
 
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
 	/**
 	 * 减员状态 1待减员 2减员中3减员退回
 	 */

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

@@ -578,7 +578,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -587,7 +587,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}
+			}*/
 
 			if(!LocalDateUtil.isDate(param.getPolicyStart(),LocalDateUtil.NORM_DATE_PATTERN)){
 				return R.failed(InsurancesConstants.POLICY_START_PARSE_ERROR);
@@ -717,7 +717,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				return R.failed(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
 			}
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -726,7 +726,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (CommonConstants.ONE_INT != data.getIsTrue()){
 					return R.failed(InsurancesConstants.EMP_ID_CARD_NO_NOT_FIT);
 				}
-			}
+			}*/
 
 			TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
 					.eq(TInsuranceReplace::getToInsuranceDetailId, byId.getId())
@@ -1984,7 +1984,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -1995,7 +1995,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			//根据项目编码查询项目是否存在
 			try{
@@ -2304,7 +2304,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getEmpName());
 			checkIdCard.setIdCard(param.getEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -2315,7 +2315,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			//根据项目编码查询项目是否存在
 			try{
@@ -2686,7 +2686,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//校验身份合法
-			TCheckIdCard checkIdCard = new TCheckIdCard();
+			/*TCheckIdCard checkIdCard = new TCheckIdCard();
 			checkIdCard.setName(param.getReplaceEmpName());
 			checkIdCard.setIdCard(param.getReplaceEmpIdcardNo());
 			R<TCheckIdCard> tCheckIdCardR = checkDaprUtil.checkIdCardSingle(checkIdCard);
@@ -2697,7 +2697,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					listResult.add(param);
 					continue;
 				}
-			}
+			}*/
 
 			if (param.getEmpName().equals(param.getReplaceEmpName()) && param.getEmpIdcardNo().equals(param.getReplaceEmpIdcardNo())){
 				param.setErrorMessage(InsurancesConstants.REPLACE_EMP_INFO_SAME);
@@ -4741,6 +4741,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			//购买标准
+			String buyStandard = param.getBuyStandard();
+			if (StringUtils.isBlank(buyStandard)){
+				param.setErrorMessage(InsurancesConstants.BUY_STANDARD_NOT_EMPTY);
+				errorList.add(param);
+				continue;
+			}
 			// 身份证号位数校验（18 位合法）
 			if (!ValidityUtil.validateIDCard(param.getEmpIdcardNo())){
 				param.setErrorMessage(InsurancesConstants.EMP_IDCARD_NO_NOT_LEGITIMATE);
@@ -4768,12 +4775,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 			LambdaQueryWrapper<TInsuranceDetail> queryWrapper = new LambdaQueryWrapper<>();
 			queryWrapper.eq(TInsuranceDetail :: getDeleteFlag,CommonConstants.ZERO_INT)
-					.eq(TInsuranceDetail ::getEmpName,empName )
-					.eq(TInsuranceDetail ::getEmpIdcardNo,empIdCardNo )
-					.eq(TInsuranceDetail :: getInsuranceCompanyName,insuranceCompanyName )
-					.eq(TInsuranceDetail :: getInsuranceTypeName,insuranceTypeName)
-					.eq(TInsuranceDetail :: getPolicyStart,LocalDateUtil.parseLocalDate(policyStart))
-					.eq(TInsuranceDetail :: getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd))
+					.eq(TInsuranceDetail::getEmpName,empName )
+					.eq(TInsuranceDetail::getEmpIdcardNo,empIdCardNo )
+					.eq(TInsuranceDetail::getInsuranceCompanyName,insuranceCompanyName )
+					.eq(TInsuranceDetail::getInsuranceTypeName,insuranceTypeName)
+					.eq(TInsuranceDetail::getPolicyStart,LocalDateUtil.parseLocalDate(policyStart))
+					.eq(TInsuranceDetail::getPolicyEnd,LocalDateUtil.parseLocalDate(policyEnd))
+					.eq(TInsuranceDetail::getBuyStandard,buyStandard)
 					.orderByDesc(TInsuranceDetail::getUpdateTime)
 					.last(CommonConstants.LAST_ONE_SQL);
 			List<TInsuranceDetail> list = list(queryWrapper);