Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request fangxinjiang/yifu!55

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

@@ -80,9 +80,15 @@ public class DeptChangeCheckParam implements Serializable {
 	private String errorMessage;
 
 	/**
-	 * 结算方式
+	 * 新项目结算方式
 	 */
 	@Schema(description = "结算方式")
-	private Integer settleType;
+	private Integer newSettleType;
+
+	/**
+	 * 旧项目结算方式
+	 */
+	@Schema(description = "结算方式")
+	private Integer oldSettleType;
 
 }

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

@@ -2338,12 +2338,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		Map<String, List<DeptChangeCheckParam>> stringListMap = deptChangeCheck(deptChangeCheckList);
 		//todo 生成EKP通知，通知ekp变更结算所属项目
 		List<DeptChangeCheckParam> successList = stringListMap.get("successList");
+
 		if(CollectionUtils.isNotEmpty(successList)){
 			for (DeptChangeCheckParam success : successList) {
+				Integer newSettleType = success.getNewSettleType();
+				Integer oldSettleType = success.getOldSettleType();
 				LambdaUpdateWrapper<TInsuranceDetail> updateWrapper = new LambdaUpdateWrapper<>();
 				updateWrapper.eq(TInsuranceDetail ::getId,success.getId())
 						.set(TInsuranceDetail :: getDeptNo,success.getNewDeptNo())
-						.set(TInsuranceDetail :: getSettleType,success.getSettleType())
+						.set(TInsuranceDetail :: getSettleType,success.getNewSettleType())
 						.set(TInsuranceDetail :: getUpdateBy,user.getId())
 						.set(TInsuranceDetail :: getUpdateTime,LocalDateTime.now());
 				update(updateWrapper);
@@ -2804,10 +2807,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
+			String defaultSettleId = insuranceDetail.getDefaultSettleId();
+			if(StringUtils.isNotEmpty(defaultSettleId)){
 				//查询结算状态
 				LambdaQueryWrapper<TInsuranceSettle> insuranceSettleQuery = new LambdaQueryWrapper<>();
 				insuranceSettleQuery.eq(TInsuranceSettle :: getInsDetailId,insuranceDetail.getId());
 				TInsuranceSettle insuranceSettle = tInsuranceSettleService.getOne(insuranceSettleQuery);
+				if (!Common.isEmpty(insuranceSettle)){
 					//当前结算状态为结算中时，不能变更结算月
 					if (CommonConstants.TWO_STRING.equals(insuranceSettle.getSettleHandleStatus())){
 						param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_SETTLE_STATUS_TWO_ERROR);
@@ -2820,9 +2826,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						errorList.add(param);
 						continue;
 					}
-			Integer reduceHandleStatus = insuranceDetail.getReduceHandleStatus();
+				}
+			}
 			//当前保单信息的为已减员时不能不能变更结算月
-			if( CommonConstants.FOUR_INT == reduceHandleStatus ){
+			if( CommonConstants.FIVE_INT == insuranceDetail.getBuyHandleStatus() ){
 				param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_REFUND_STATUS_FOUR_ERROR);
 				errorList.add(param);
 				continue;
@@ -2949,7 +2956,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							errorList.add(param);
 							continue;
 						}else {
-							param.setSettleType(Integer.parseInt(settleType));
+							param.setNewSettleType(Integer.parseInt(settleType));
 						}
 					}
 				}
@@ -2986,13 +2993,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
-			Integer reduceHandleStatus = insuranceDetail.getReduceHandleStatus();
 			//当前保单信息的为已减员时，不能变更结算项目
-			if( CommonConstants.FOUR_INT == reduceHandleStatus ){
+			if( CommonConstants.FIVE_INT == insuranceDetail.getBuyHandleStatus() ){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_REFUND_STATUS_FOUR_ERROR);
 				errorList.add(param);
 				continue;
 			}
+			String defaultSettleId = insuranceDetail.getDefaultSettleId();
+			if (StringUtils.isNotBlank(defaultSettleId)){
 				//查询结算状态
 				LambdaQueryWrapper<TInsuranceSettle> insuranceSettleQuery = new LambdaQueryWrapper<>();
 				insuranceSettleQuery.eq(TInsuranceSettle :: getInsDetailId,insuranceDetail.getId());
@@ -3009,6 +3017,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					errorList.add(param);
 					continue;
 				}
+			}
 			//判断当前数据中是否存在重复数据
 			param.setId(insuranceDetail.getId());
 			successList.add(param);