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

Feature licancan

See merge request !304

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

@@ -39,7 +39,7 @@ public class EkpUpdateParam implements Serializable {
 	private String fd_3b5bf031b52314;
 
 	/**
-	 * 商险ID
+	 * 商险ID:商险id_结算id
 	 */
 	private String fd_3b5bf032d7a822;
 

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

@@ -2055,25 +2055,30 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						.orderByDesc(TInsuranceDetail::getUpdateTime)
 						.last(CommonConstants.LAST_ONE_SQL)
 				);
-				//当两次发票号不一致时才更新
-				if (!success.getInvoiceNo().equals(detail.getInvoiceNo())){
-					//设置发票号
-					detail.setInvoiceNo(success.getInvoiceNo());
-					detailList.add(detail);
+				if (Optional.ofNullable(detail).isPresent()){
+					//当两次发票号不一致时才更新
+					if (!success.getInvoiceNo().equals(detail.getInvoiceNo())){
+						//设置发票号
+						detail.setInvoiceNo(success.getInvoiceNo());
+						detailList.add(detail);
 
-					try {
-						//推送修改信息
-						EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
-						ekpUpdateParam.setFd_3b5bf02d3b8fc4(success.getPolicyStart());
-						ekpUpdateParam.setFd_3b5bf02e1d47cc(success.getPolicyEnd());
-						ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(detail.getBuyType()));
-						ekpUpdateParam.setFd_3b5bf030ab1a56(success.getInvoiceNo());
-						ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
-						ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId());
-						ekpUpdateParam.setFd_3b5bf0b7b4c058("操作人:"+user.getNickname() + ";操作时间:"+LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + ";变更前发票号:" + detail.getInvoiceNo() + ";变更后发票号:" + success.getInvoiceNo());
-						eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
-					}catch (Exception e){
-						log.error("pushEkp error registeredInvoiceNo:",e.getMessage());
+						//只有当结算id存在的时候修改数据才会推给ekp
+						if (StringUtils.isNotBlank(detail.getDefaultSettleId())){
+							try {
+								//推送修改信息
+								EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
+								ekpUpdateParam.setFd_3b5bf02d3b8fc4(success.getPolicyStart());
+								ekpUpdateParam.setFd_3b5bf02e1d47cc(success.getPolicyEnd());
+								ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(detail.getBuyType()));
+								ekpUpdateParam.setFd_3b5bf030ab1a56(success.getInvoiceNo());
+								ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
+								ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId());
+								ekpUpdateParam.setFd_3b5bf0b7b4c058("操作人:"+user.getNickname() + ";操作时间:"+LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + ";变更前发票号:" + detail.getInvoiceNo() + ";变更后发票号:" + success.getInvoiceNo());
+								eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
+							}catch (Exception e){
+								log.error("pushEkp error registeredInvoiceNo:",e.getMessage());
+							}
+						}
 					}
 				}
 			}
@@ -2156,45 +2161,49 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						.orderByDesc(TInsuranceDetail::getUpdateTime)
 						.last(CommonConstants.LAST_ONE_SQL)
 				);
-
-				TInsuranceDetail oldDetail = new TInsuranceDetail();
-				BeanCopyUtils.copyProperties(detail,oldDetail);
-				if (StringUtils.isNotBlank(success.getPolicyStartNew())){
-					detail.setPolicyStart(LocalDateUtil.parseLocalDate(success.getPolicyStartNew()));
-				}
-				if (StringUtils.isNotBlank(success.getPolicyEndNew())){
-					detail.setPolicyEnd(LocalDateUtil.parseLocalDate(success.getPolicyEndNew()));
-				}
-				if (Objects.nonNull(success.getBuyType())){
-					detail.setBuyType(success.getBuyType());
-				}
-				detailList.add(detail);
-				//变更记录
-				tBusinessOperateService.saveModificationRecord(detail.getId(),oldDetail,detail,success.getReason());
-
-				try {
-					//推送修改信息
-					StringBuilder sb = new StringBuilder();
-					sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-					if (!oldDetail.getPolicyStart().toString().equals(success.getPolicyStart())) {
-						sb.append(";变更前保单开始时间:" + oldDetail.getPolicyStart() + ";变更后保单开始时间:" + success.getPolicyStart());
+				if (Optional.ofNullable(detail).isPresent()){
+					TInsuranceDetail oldDetail = new TInsuranceDetail();
+					BeanCopyUtils.copyProperties(detail,oldDetail);
+					if (StringUtils.isNotBlank(success.getPolicyStartNew())){
+						detail.setPolicyStart(LocalDateUtil.parseLocalDate(success.getPolicyStartNew()));
 					}
-					if (!oldDetail.getPolicyEnd().toString().equals(success.getPolicyEnd())) {
-						sb.append(";变更前保单结束时间:" + oldDetail.getPolicyEnd() + ";变更后保单结束时间:" + success.getPolicyEnd());
+					if (StringUtils.isNotBlank(success.getPolicyEndNew())){
+						detail.setPolicyEnd(LocalDateUtil.parseLocalDate(success.getPolicyEndNew()));
 					}
-					if (!oldDetail.getBuyType().equals(success.getBuyType())) {
-						sb.append(";变更前投保类型:" + getBuyType(oldDetail.getBuyType()) + ";变更后投保类型:" + getBuyType(success.getBuyType()));
+					if (Objects.nonNull(success.getBuyType())){
+						detail.setBuyType(success.getBuyType());
+					}
+					detailList.add(detail);
+					//变更记录
+					tBusinessOperateService.saveModificationRecord(detail.getId(),oldDetail,detail,success.getReason());
+
+					//只有当结算id存在的时候修改数据才会推给ekp
+					if (StringUtils.isNotBlank(detail.getDefaultSettleId())){
+						try {
+							//推送修改信息
+							StringBuilder sb = new StringBuilder();
+							sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+							if (!oldDetail.getPolicyStart().toString().equals(success.getPolicyStart())) {
+								sb.append(";变更前保单开始时间:" + oldDetail.getPolicyStart() + ";变更后保单开始时间:" + success.getPolicyStart());
+							}
+							if (!oldDetail.getPolicyEnd().toString().equals(success.getPolicyEnd())) {
+								sb.append(";变更前保单结束时间:" + oldDetail.getPolicyEnd() + ";变更后保单结束时间:" + success.getPolicyEnd());
+							}
+							if (!oldDetail.getBuyType().equals(success.getBuyType())) {
+								sb.append(";变更前投保类型:" + getBuyType(oldDetail.getBuyType()) + ";变更后投保类型:" + getBuyType(success.getBuyType()));
+							}
+							EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
+							ekpUpdateParam.setFd_3b5bf02d3b8fc4(success.getPolicyStart());
+							ekpUpdateParam.setFd_3b5bf02e1d47cc(success.getPolicyEnd());
+							ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(success.getBuyType()));
+							ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
+							ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId() + "_" + detail.getDefaultSettleId());
+							ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
+							eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
+						}catch (Exception e){
+							log.error("pushEkp error updateInsuranceInsured:",e.getMessage());
+						}
 					}
-					EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
-					ekpUpdateParam.setFd_3b5bf02d3b8fc4(success.getPolicyStart());
-					ekpUpdateParam.setFd_3b5bf02e1d47cc(success.getPolicyEnd());
-					ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(success.getBuyType()));
-					ekpUpdateParam.setFd_3b5bf031b52314(detail.getBuyStandard());
-					ekpUpdateParam.setFd_3b5bf032d7a822(detail.getId());
-					ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
-					eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
-				}catch (Exception e){
-					log.error("pushEkp error updateInsuranceInsured:",e.getMessage());
 				}
 			}
 		}
@@ -2275,29 +2284,32 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		//变更记录
 		tBusinessOperateService.saveModificationRecord(byId.getId(),old,byId,param.getReason());
 
-		try {
-			//推送修改信息
-			StringBuilder sb = new StringBuilder();
-			sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-			if (!old.getPolicyStart().toString().equals(param.getPolicyStart())) {
-				sb.append(";变更前保单开始时间:" + old.getPolicyStart() + ";变更后保单开始时间:" + param.getPolicyStart());
-			}
-			if (!old.getPolicyEnd().toString().equals(param.getPolicyEnd())) {
-				sb.append(";变更前保单结束时间:" + old.getPolicyEnd() + ";变更后保单结束时间:" + param.getPolicyEnd());
-			}
-			if (!old.getBuyType().equals(param.getBuyType())) {
-				sb.append(";变更前投保类型:" + getBuyType(old.getBuyType()) + ";变更后投保类型:" + getBuyType(param.getBuyType()));
-			}
-			EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
-			ekpUpdateParam.setFd_3b5bf02d3b8fc4(param.getPolicyStart());
-			ekpUpdateParam.setFd_3b5bf02e1d47cc(param.getPolicyEnd());
-			ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(param.getBuyType()));
-			ekpUpdateParam.setFd_3b5bf031b52314(byId.getBuyStandard());
-			ekpUpdateParam.setFd_3b5bf032d7a822(byId.getId());
-			ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
-			eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
-		}catch (Exception e){
-			log.error("pushEkp error updateInsuranceInsuredById:",e.getMessage());
+		//只有当结算id存在的时候修改数据才会推给ekp
+		if(StringUtils.isNotBlank(byId.getDefaultSettleId())){
+			try {
+				//推送修改信息
+				StringBuilder sb = new StringBuilder();
+				sb.append("操作人:" + user.getNickname() + ";操作时间:" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+				if (!old.getPolicyStart().toString().equals(param.getPolicyStart())) {
+					sb.append(";变更前保单开始时间:" + old.getPolicyStart() + ";变更后保单开始时间:" + param.getPolicyStart());
+				}
+				if (!old.getPolicyEnd().toString().equals(param.getPolicyEnd())) {
+					sb.append(";变更前保单结束时间:" + old.getPolicyEnd() + ";变更后保单结束时间:" + param.getPolicyEnd());
+				}
+				if (!old.getBuyType().equals(param.getBuyType())) {
+					sb.append(";变更前投保类型:" + getBuyType(old.getBuyType()) + ";变更后投保类型:" + getBuyType(param.getBuyType()));
+				}
+				EkpUpdateParam ekpUpdateParam = new EkpUpdateParam();
+				ekpUpdateParam.setFd_3b5bf02d3b8fc4(param.getPolicyStart());
+				ekpUpdateParam.setFd_3b5bf02e1d47cc(param.getPolicyEnd());
+				ekpUpdateParam.setFd_3b5bf02fa14596(getBuyType(param.getBuyType()));
+				ekpUpdateParam.setFd_3b5bf031b52314(byId.getBuyStandard());
+				ekpUpdateParam.setFd_3b5bf032d7a822(byId.getId() + "_" + byId.getDefaultSettleId());
+				ekpUpdateParam.setFd_3b5bf0b7b4c058(sb.toString());
+				eKPInsuranceUtil.sendUpdateToEkp(ekpUpdateParam);
+			}catch (Exception e){
+				log.error("pushEkp error updateInsuranceInsuredById:",e.getMessage());
+			}
 		}
 		this.updateById(byId);
 		return R.ok(InsurancesConstants.OPERATE_SUCCESS);

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

@@ -35,12 +35,18 @@
 		<if test="param.policyNo != null and param.policyNo.trim() != ''">
 			and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
 		</if>
-		<if test="param.policyStart != null and param.policyStart.trim() != ''">
+		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd == null">
 			AND DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart}
 		</if>
-		<if test="param.policyEnd != null and param.policyEnd.trim() != ''">
+		<if test="param.policyEnd != null and param.policyEnd.trim() != '' and param.policyStart == null">
 			AND DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd}
 		</if>
+		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
+			and (
+			(DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart} and DATE(POLICY_START) <![CDATA[ <= ]]> #{param.policyEnd}) OR
+			(DATE(POLICY_END) <![CDATA[ >= ]]> #{param.policyStart} and DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd})
+			)
+		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -61,12 +67,18 @@
 		<if test="param.policyNo != null and param.policyNo.trim() != ''">
 			and POLICY_NO like concat('%',replace(replace(#{param.policyNo},'_','\_'),'%','\%'),'%')
 		</if>
-		<if test="param.policyStart != null and param.policyStart.trim() != ''">
+		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd == null">
 			AND DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart}
 		</if>
-		<if test="param.policyEnd != null and param.policyEnd.trim() != ''">
+		<if test="param.policyEnd != null and param.policyEnd.trim() != '' and param.policyStart == null">
 			AND DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd}
 		</if>
+		<if test="param.policyStart != null and param.policyStart.trim() != '' and param.policyEnd != null and param.policyEnd.trim() != ''">
+			and (
+			(DATE(POLICY_START) <![CDATA[ >= ]]> #{param.policyStart} and DATE(POLICY_START) <![CDATA[ <= ]]> #{param.policyEnd}) OR
+			(DATE(POLICY_END) <![CDATA[ >= ]]> #{param.policyStart} and DATE(POLICY_END) <![CDATA[ <= ]]> #{param.policyEnd})
+			)
+		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
 		</if>