"feature-zhaJi:修改减员办理分页查询参数和查询条件"

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

@@ -2616,12 +2616,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						.set(TInsuranceDetail :: getSettleType,success.getNewSettleType())
 						.set(TInsuranceDetail :: getUpdateBy,user.getId())
 						.set(TInsuranceDetail :: getUpdateTime,LocalDateTime.now());
-				TInsuranceSettle tInsuranceSettle = new TInsuranceSettle();
+
 				//如果旧项目为合并结算，且新项目也是合并结算，则计算新的预估保费，作废旧的预估保费
 				if(CommonConstants.ZERO_INT == oldSettleType && CommonConstants.ZERO_INT == newSettleType){
 					updateWrapper.set(TInsuranceDetail ::getEstimatePremium,success.getEstimatePremium());
 					//如果存在则更新，不存在则新建
 					if (StringUtils.isNotBlank(success.getDefaultSettleId())){
+						TInsuranceSettle tInsuranceSettle = tInsuranceSettleService.getById(success.getDefaultSettleId());
+
 						tInsuranceSettle.setId(success.getDefaultSettleId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setInsDetailId(success.getId());
@@ -2629,6 +2631,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						tInsuranceSettle.setUpdateTime(LocalDateTime.now());
 						tInsuranceSettleService.updateById(tInsuranceSettle);
 					}else{
+						TInsuranceSettle tInsuranceSettle = new TInsuranceSettle();
 						tInsuranceSettle.setInsDetailId(success.getId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setSettleHandleStatus(CommonConstants.ONE_STRING);
@@ -2645,6 +2648,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if(CommonConstants.ZERO_INT == oldSettleType && CommonConstants.ONE_INT == newSettleType){
 					//更新旧的结算信息
 					if (StringUtils.isNotBlank(success.getDefaultSettleId())){
+						TInsuranceSettle tInsuranceSettle = tInsuranceSettleService.getById(success.getDefaultSettleId());
 						tInsuranceSettle.setId(success.getDefaultSettleId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setInsDetailId(success.getId());
@@ -2655,7 +2659,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						TInsuranceSettleCancel tInsuranceSettleCancel = new TInsuranceSettleCancel();
 						tInsuranceSettleCancel.setInsDetailId(success.getId());
 						tInsuranceSettleCancel.setSettleId(success.getDefaultSettleId());
-
+						tInsuranceSettleCancel.setDeptNo(success.getOldDeptNo());
+						tInsuranceSettleCancel.setIsCancelPush(CommonConstants.ZERO_INT);
+						tInsuranceSettleCancel.setCreateUesr(user.getId());
+						tInsuranceSettleCancel.setCreateTime(LocalDateTime.now());
 					}else{
 						//更新预估保费
 						updateWrapper.set(TInsuranceDetail ::getEstimatePremium,new BigDecimal("0"));
@@ -2666,6 +2673,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					updateWrapper.set(TInsuranceDetail ::getEstimatePremium,success.getEstimatePremium());
 					//更新旧的结算信息
 					if (StringUtils.isNotBlank(success.getDefaultSettleId())){
+						TInsuranceSettle tInsuranceSettle = tInsuranceSettleService.getById(success.getDefaultSettleId());
 						tInsuranceSettle.setId(success.getDefaultSettleId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setInsDetailId(success.getId());
@@ -2674,6 +2682,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						tInsuranceSettleService.updateById(tInsuranceSettle);
 						//推送EKP
 					}else{
+						TInsuranceSettle tInsuranceSettle = new TInsuranceSettle();
 						tInsuranceSettle.setInsDetailId(success.getId());
 						tInsuranceSettle.setSettleType(success.getNewSettleType());
 						tInsuranceSettle.setSettleHandleStatus(CommonConstants.ONE_STRING);
@@ -2686,9 +2695,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						updateWrapper.set(TInsuranceDetail::getDefaultSettleId,tInsuranceSettle.getId());
 					}
 				}
-				//如果旧项目为单独结算，且新项目也是单独结算，则更新单独结算信息
+				//如果旧项目为单独结算，且新项目也是单独结算，则更新项目编码，并发送至ekp
 				if(CommonConstants.ONE_INT == oldSettleType && CommonConstants.ONE_INT == newSettleType){
-					updateWrapper.set(TInsuranceDetail ::getEstimatePremium,success.getEstimatePremium());
+					//updateWrapper.set(TInsuranceDetail ::getEstimatePremium,success.getEstimatePremium());
 				}
 				update(updateWrapper);
 				TInsuranceOperate insuranceOperate = new TInsuranceOperate();
@@ -2704,8 +2713,29 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<DeptChangeCheckParam> errorList = stringListMap.get("errorList");
 		return R.ok(errorList,"导入成功");
 	}
+
 	/**
-	 * 发送变更通知至EKP
+	 * 发送变更结算月至EKP
+	 *
+	 * @author zhaji
+	 * @param successList
+	 * @return void
+	 */
+	private void updateMonth2EKP(List<DeptChangeCheckParam> successList) {
+		for (DeptChangeCheckParam param : successList) {
+			String newDeptNo = param.getNewDeptNo();
+			String oldDeptNo = param.getOldDeptNo();
+			Integer newSettleType = param.getNewSettleType();
+			Integer oldSettleType = param.getOldSettleType();
+			String defaultSettleId = param.getDefaultSettleId();
+			if (StringUtils.isNotBlank(defaultSettleId) && CommonConstants.ZERO_INT == newSettleType){
+
+			}
+		}
+	}
+
+	/**
+	 * 发送变更项目至EKP
 	 *
 	 * @author zhaji
 	 * @param successList
@@ -2724,6 +2754,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 	}
 
+	/**
+	 * 发送作废信息至EKP
+	 *
+	 * @author zhaji
+	 * @param cancelList 作废信息列表
+	 * @return void
+	 */
+	private void pushSettleCancel2EKP(List<TInsuranceSettleCancel> cancelList) {
+		for (TInsuranceSettleCancel param : cancelList) {
+
+		}
+	}
+
 	/**
 	 * 根据保险公司名称查询保单明细
 	 *
@@ -3469,7 +3512,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					param.setEstimatePremium(estimatePremium);
 				}
 			}
-			//如果
+			//去重
 			for (int j =0 ;j< deptChangeCheckList.size();j++) {
 				DeptChangeCheckParam CheckParam = deptChangeCheckList.get(j);
 				if(CheckParam.getEmpName().equals(param.getEmpName())