Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1

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

@@ -56,6 +56,12 @@ public class DeptChangeCheckParam implements Serializable {
 	@Schema(description = "新项目编码")
 	private String newDeptNo;
 
+	/**
+	 * 新项目id
+	 */
+	@Schema(description = "新项目id")
+	private String newDeptId;
+
 	/**
 	 * 保险公司名称
 	 */
@@ -134,6 +140,12 @@ public class DeptChangeCheckParam implements Serializable {
 	@Schema(description = "客户编码")
 	private String newCustomerCode;
 
+	/**
+	 * 客户id
+	 */
+	@Schema(description = "客户id")
+	private String newCustomerId;
+
 	/**
 	 * 客户名称
 	 */

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

@@ -4791,6 +4791,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							.set(TInsuranceDetail :: getDeptName,success.getNewDeptName())
 							.set(TInsuranceDetail :: getUnitNo,success.getNewCustomerCode())
 							.set(TInsuranceDetail :: getUnitName,success.getNewCustomerName())
+							.set(TInsuranceDetail :: getDeptId,success.getNewDeptId())
+							.set(TInsuranceDetail :: getUnitId,success.getNewCustomerId())
 							.set(TInsuranceDetail :: getSettleType,newSettleType)
 							.set(TInsuranceDetail :: getActualPremium,actualPremium)
 							.set(TInsuranceDetail :: getEstimatePremium,estimatePremium)
@@ -6496,6 +6498,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					param.setNewDeptName(jsonObject.getDepartName());
 					param.setNewCustomerName(jsonObject.getCustomerName());
 					param.setNewCustomerCode(jsonObject.getCustomerCode());
+					param.setNewDeptId(jsonObject.getId());
+					param.setNewCustomerId(jsonObject.getCustomerId());
 					String settleType = jsonObject.getInsuranceSettleType();
 					if (StringUtils.isEmpty(settleType)){
 						param.setErrorMessage(InsurancesConstants.PROJECT_NOT_FIND_SETTLE_TYPE);
@@ -6546,18 +6550,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				errorList.add(param);
 				continue;
 			}
-			//旧项目ID不在当前权限范围内
-			if(deptNoList.stream().noneMatch(u ->u.equals(oldDeptNo))){
-				param.setErrorMessage(InsurancesConstants.OLD_DEPT_NO_NOT_IN_DEPT_LIST);
-				errorList.add(param);
-				continue;
-			}
-			//新项目ID不在当前权限范围内
-			if(deptNoList.stream().noneMatch(u ->u.equals(newDeptNo))){
-				param.setErrorMessage(InsurancesConstants.NEW_DEPT_NO_NOT_IN_DEPT_LIST);
-				errorList.add(param);
-				continue;
-			}
+//			//旧项目ID不在当前权限范围内
+//			if(deptNoList.stream().noneMatch(u ->u.equals(oldDeptNo))){
+//				param.setErrorMessage(InsurancesConstants.OLD_DEPT_NO_NOT_IN_DEPT_LIST);
+//				errorList.add(param);
+//				continue;
+//			}
+//			//新项目ID不在当前权限范围内
+//			if(deptNoList.stream().noneMatch(u ->u.equals(newDeptNo))){
+//				param.setErrorMessage(InsurancesConstants.NEW_DEPT_NO_NOT_IN_DEPT_LIST);
+//				errorList.add(param);
+//				continue;
+//			}
 			//替换类型的保单不能变更所属项目
 			Integer buyType = insuranceDetail.getBuyType();
 			if (CommonConstants.FOUR_INT == buyType){