Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:优化项目变更提示语句"

See merge request fangxinjiang/yifu!101

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -92,6 +92,7 @@ public class InsurancesConstants {
 	 * 项目编码不存在
 	 */
 	public static final String DEPT_NO_IS_NOT_EXIST = "项目编码不存在";
+
 	/**
 	 * 替换员工项目不存在
 	 */
@@ -477,9 +478,9 @@ public class InsurancesConstants {
 
 
 	/**
-	 * 替换项目ID和原有项目ID相同
+	 * 替换项目编码和原编码一致
 	 */
-	public static final String DEPT_NO_IDENTICAL = "替换项目ID和原有项目ID相同";
+	public static final String DEPT_NO_IDENTICAL = "替换项目编码和原编码一致";
 
 	/**
 	 * 重复数据

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

@@ -2754,7 +2754,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (!BigDecimalUtils.isNullOrZero(actualPremium)){
 						//变更后为单独结算
 						if(CommonConstants.ONE_INT == newSettleType){
-							update(updateWrapper);
 							//作废旧的数据，生成作废结算信息记录
 							TInsuranceSettleCancel cancel = new TInsuranceSettleCancel();
 							cancel.setDeptNo(success.getOldDeptNo());
@@ -2764,6 +2763,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							cancel.setCreateTime(LocalDateTime.now());
 							tInsuranceSettleCancelService.save(cancel);
 							//推送EKP // TODO: 2022/8/2
+							TInsuranceSettle byId = tInsuranceSettleService.getById(insuranceDetailId);
+							//如果已经推送过实际保费，则先作废，再推送新的预估保费和实际保费
+							if (byId.getIsActualPush() ==1){
+
+							}
 							//新增新的结算数据
 							TInsuranceSettle newInsuranceSettle = new TInsuranceSettle();
 							newInsuranceSettle.setInsDetailId(insuranceDetailId);
@@ -2909,7 +2913,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							updateWrapper.set(TInsuranceDetail ::getEstimatePremium,new BigDecimal("0.00"));
 							updateWrapper.set(TInsuranceDetail :: getDefaultSettleId,null);
 							update(updateWrapper);
-							
 						}
 						//变更为合并结算
 						if (CommonConstants.ZERO_INT == newSettleType){
@@ -3553,6 +3556,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<DeptChangeCheckParam> successList = new ArrayList<>();
 		for (int i =0 ;i< deptChangeCheckList.size();i++) {
 			DeptChangeCheckParam param = deptChangeCheckList.get(i);
+			//变更后的项目
 			String newDeptNo = param.getNewDeptNo();
 			if(StringUtils.isBlank(newDeptNo)){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_NOT_EMPTY);
@@ -3573,7 +3577,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
-			//所属项目
+			//原项目
 			String oldDeptNo = param.getOldDeptNo();
 			if(StringUtils.isBlank(oldDeptNo)){
 				param.setErrorMessage(InsurancesConstants.DEPT_NO_NOT_EMPTY);
@@ -3638,7 +3642,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS) {
 				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				if (MapUtils.isEmpty(data)){
-					param.setErrorMessage(InsurancesConstants.DEPT_NO_IS_NOT_EXIST);
+					param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_IS_NOT_EXIST);
 					errorList.add(param);
 					continue;
 				}else {