Merge remote-tracking branch 'origin/master'

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -450,7 +450,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		addVo.setProjectsMap(projectsMap);
 		R<EmpDispatchAddVo> res = archivesDaprUtil.addDispatchInfo(addVo);
 		// 开始插入各种数据了
-		insertAllInfo(excelVOList, errorMessageList, setInfoVo, res,socialsMap,fundsMap,socialFundAddMap,dispatchMap,excelVOTemp,dispatchPart,injury);
+		insertAllInfo(excelVOList, errorMessageList, res,socialsMap,fundsMap,socialFundAddMap,dispatchMap,excelVOTemp,dispatchPart,injury);
 		// 清理map list 等数据
 		Common.clear(excelVOList);
 		Common.clear(empAddsMap);
@@ -479,7 +479,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 	private void insertAllInfo(List<TDispatchImportVo> excelVOList,
 							   List<ErrorMessage> errorMessageList,
-							   ProjectSetInfoVo setInfoVo,
 							   R<EmpDispatchAddVo> res,
 							   Map<String, TSocialInfo> socialsMap,
 							   Map<String, TProvidentFund> fundsMap,
@@ -567,7 +566,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						}
 					}
 					dispatch.setFirstBuyMonthSocial(getFirstBuyMonthSocial(social));
-					insertDispatch(emp, dispatch,setInfoVo);
+					insertDispatch(emp, dispatch);
 				}
 				//  插入或更新社保公积金查询信息  大病在封装社保的时候已经算了 大病技术和金额了
 				if (Common.isNotNull(socialFundAddMap)){
@@ -647,16 +646,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 	}
 
-	private void insertDispatch(EmpAddDispatchVo emp, TDispatchInfo dispatch, ProjectSetInfoVo setInfoVo) {
+	private void insertDispatch(EmpAddDispatchVo emp, TDispatchInfo dispatch) {
 		if (Common.isNotNull(dispatch)){
 			if (Common.isNotNull(emp)){
 				dispatch.setEmpId(emp.getId());
 			}
-			if (Common.isNotNull(setInfoVo)){
-				dispatch.setSettleDomainName(setInfoVo.getDepartName());
-				dispatch.setSettleDomainCode(setInfoVo.getDepartNo());
-				dispatch.setSettleDomain(setInfoVo.getId());
-			}
 			dispatch.setCreateTime(LocalDateTime.now());
 			baseMapper.insert(dispatch);
 		}
@@ -1017,7 +1011,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 										 SysBaseSetInfo socialSet,
 										 SysBaseSetInfo fundSet,
 										 TDispatchImportVo excel,
-										 TSocialFundInfo socialFund, boolean injury) {
+										 TSocialFundInfo socialFund,
+										 boolean injury) {
 		TDispatchInfo dispatch = new TDispatchInfo();
 		// 初始化派单项
 		dispatch.setOrderId(excel.getOrderId());
@@ -1035,6 +1030,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dispatch.setType(CommonConstants.ZERO_STRING);
 		dispatch.setCurrentOperator(user.getNickname());
 		dispatch.setTrustRemark(excel.getTrustRemark());
+		dispatch.setBelongUnitName(excel.getCustomerName());
+		dispatch.setBelongUnit(excel.getCustomerId());
+		dispatch.setSettleDomainName(excel.getDepartName());
+		dispatch.setSettleDomainCode(excel.getSettleDomainCode());
+		dispatch.setSettleDomain(excel.getSettleDomainId());
 		if (Common.isNotNull(excel.getSocialHousehold())){
 			dispatch.setSocialHandleStatus(CommonConstants.ZERO_STRING);
 		}