批量新增导入

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -382,4 +382,18 @@ public interface ErrorCodes {
 	 * 新增异常：未找到对应项目编码信息
 	 */
 	String EMP_DISPATCH_PROJECT_NOT_FOUND = "emp.dispatch.project.not.found";
+
+	/**
+	 * 新增异常：派单新增档案失败，请重试
+	 */
+	String EMP_DISPATCH_ADD_EMP_ERROR = "emp.dispatch.add.emp.error";
+	/**
+	 * 新增异常：派单新增合同失败，请重试
+	 */
+	String EMP_DISPATCH_ADD_CONTRACT_ERROR="emp.dispatch.add.contract.error";
+
+	/**
+	 * 新增异常：派单新增项目档案失败，请重试
+	 */
+	String EMP_DISPATCH_ADD_PROJECT_ERROR="emp.dispatch.add.project.error";
 }

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java

@@ -3,10 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
 import com.alibaba.fastjson.JSON;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpDispatchAddVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -102,8 +99,8 @@ public class ArchivesDaprUtil {
 		return res;
 	}
 
-	public R<DispatchAddVo> addDispatchInfo(EmpDispatchAddVo addVo) {
-		R<DispatchAddVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/addDispatchInfo" , JSON.toJSONString(addVo), DispatchAddVo.class, SecurityConstants.FROM_IN);
+	public R<EmpDispatchAddVo> addDispatchInfo(EmpDispatchAddVo addVo) {
+		R<EmpDispatchAddVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/addDispatchInfo" , JSON.toJSONString(addVo), EmpDispatchAddVo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(res)){
 			return R.failed("新增档案|项目档案|合同信息失败！");
 		}

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

@@ -793,7 +793,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	/**
 	 * @Author fxj
 	 * @Description 对比公积金比例，对应上true  false
-	**/
+	 **/
 	private boolean checkFundPer(List<SysPayProportion> pays,TDispatchImportVo excel){
 		if (Common.isNotNull(excel.getProvidentPer()) && Common.isNotNull(pays)){
 			for (SysPayProportion per: pays){
@@ -971,10 +971,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	}
 
 	private BigDecimal ifNull(BigDecimal old,BigDecimal last){
-			if (Common.isEmpty(old)){
-				return last;
-			}
-			return old;
+		if (Common.isEmpty(old)){
+			return last;
+		}
+		return old;
 	}
 	private Date ifNull(Date old,Date last){
 		if (Common.isEmpty(old)){