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

Feature licancan

See merge request !300

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

@@ -85,11 +85,11 @@ public class InsuranceExportListParam extends BaseEntity implements Serializable
 	 * 购买标准开始
 	 */
 	@Schema(description = "购买标准开始")
-	private String buyStandardMin;
+	private Integer buyStandardMin;
 
 	/**
 	 * 购买标准结束
 	 */
 	@Schema(description = "购买标准结束")
-	private String buyStandardMax;
+	private Integer buyStandardMax;
 }

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

@@ -98,12 +98,12 @@ public class InsuranceListParam extends BaseEntity {
 	 * 购买标准开始
 	 */
 	@Schema(description = "购买标准开始")
-	private String buyStandardMin;
+	private Integer buyStandardMin;
 
 	/**
 	 * 购买标准结束
 	 */
 	@Schema(description = "购买标准结束")
-	private String buyStandardMax;
+	private Integer buyStandardMax;
 
 }

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

@@ -3440,22 +3440,25 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 				}
 
-				//批增类型，保单号不存在
+				//批增类型，保单号存在
 				if (detail.getBuyType() == CommonConstants.THREE_INT){
 					if (StringUtils.isNotBlank(param.getPolicyNo())){
-						TInsuranceDetail batchPolicyNo = this.baseMapper.selectOne(Wrappers.<TInsuranceDetail>query().lambda()
-								.eq(TInsuranceDetail::getPolicyNo, param.getPolicyNo())
-								.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
-								.orderByDesc(TInsuranceDetail::getUpdateTime)
+						TInsurancePolicy batchPolicyNo = tInsurancePolicyService.getOne(Wrappers.<TInsurancePolicy>query().lambda()
+								.eq(TInsurancePolicy::getPolicyNo, param.getPolicyNo())
+								.eq(TInsurancePolicy::getDeleteFlag, CommonConstants.ZERO_INT)
 								.last(CommonConstants.LAST_ONE_SQL)
 						);
 						if (!Optional.ofNullable(batchPolicyNo).isPresent()){
 							param.setErrorMessage(InsurancesConstants.POLICY_NO_NOT_EXIST);
 							continue;
 						}else {
-							//批增类型，保单号已存在但是和派单时填写的不一致
-							if (!detail.getPolicyNo().equals(param.getPolicyNo())){
-								param.setErrorMessage(InsurancesConstants.POLICY_NO_ERROR);
+							//保单表中存在保单号，判断保险公司和险种是否一致
+							if(!batchPolicyNo.getInsuranceCompanyName().equals(param.getInsuranceCompanyName())){
+								param.setErrorMessage(InsurancesConstants.POLICY_NO_COMPANY_NAME_NOT_SAME);
+								continue;
+							}
+							if(!batchPolicyNo.getInsuranceTypeName().equals(param.getInsuranceTypeName())){
+								param.setErrorMessage(InsurancesConstants.POLICY_NO_TYPE_NAME_NOT_SAME);
 								continue;
 							}
 						}
@@ -3465,10 +3468,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				//新增类型，保单号已存在但是和填写的保险公司不一致
 				if (detail.getBuyType() == CommonConstants.ONE_INT){
 					if (StringUtils.isNotBlank(param.getPolicyNo())){
-						TInsuranceDetail addPolicyNo = this.baseMapper.selectOne(Wrappers.<TInsuranceDetail>query().lambda()
-								.eq(TInsuranceDetail::getPolicyNo, param.getPolicyNo())
-								.eq(TInsuranceDetail::getDeleteFlag, CommonConstants.ZERO_INT)
-								.orderByDesc(TInsuranceDetail::getUpdateTime)
+						TInsurancePolicy addPolicyNo = tInsurancePolicyService.getOne(Wrappers.<TInsurancePolicy>query().lambda()
+								.eq(TInsurancePolicy::getPolicyNo, param.getPolicyNo())
+								.eq(TInsurancePolicy::getDeleteFlag, CommonConstants.ZERO_INT)
 								.last(CommonConstants.LAST_ONE_SQL)
 						);
 						if (Optional.ofNullable(addPolicyNo).isPresent()){

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -278,10 +278,10 @@
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
-		<if test="param.buyStandardMin != null and param.buyStandardMin.trim() != ''">
+		<if test="param.buyStandardMin != null">
 			AND a.BUY_STANDARD <![CDATA[ >= ]]> #{param.buyStandardMin}
 		</if>
-		<if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
+		<if test="param.buyStandardMax != null">
 			AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardMax}
 		</if>
 		ORDER BY a.BUY_HANDLE_STATUS,a.CREATE_TIME DESC
@@ -427,10 +427,10 @@
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}
 		</if>
-		<if test="param.buyStandardMin != null and param.buyStandardMin.trim() != ''">
+		<if test="param.buyStandardMin != null">
 			AND a.BUY_STANDARD <![CDATA[ >= ]]> #{param.buyStandardMin}
 		</if>
-		<if test="param.buyStandardMax != null and param.buyStandardMax.trim() != ''">
+		<if test="param.buyStandardMax != null">
 			AND a.BUY_STANDARD <![CDATA[ <= ]]> #{param.buyStandardMax}
 		</if>
 		ORDER BY a.CREATE_TIME DESC