Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java

@@ -200,4 +200,19 @@ public class EmpContractDispatchVo implements Serializable {
 	@ExcelAttribute(name = "项目", errorInfo = "项目不能为空", isOrgan = true, maxLength = 32)
 	@Schema(description = "项目", name = "settleDomain")
 	private String settleDomain;
+
+	/**
+	 * 项目名称
+	 */
+	@Length(max = 128, message = "项目名称不能超过128个字符")
+	@ExcelAttribute(name = "项目名称", maxLength = 128)
+	@Schema(description = "项目名称", name = "subjectDepart")
+	private String subjectDepart;
+	/**
+	 * 客户名称
+	 */
+	@Length(max = 128, message = "客户名称不能超过128个字符")
+	@ExcelAttribute(name = "客户名称", maxLength = 128)
+	@Schema(description = "客户名称", name = "subjectUnit")
+	private String subjectUnit;
 }

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpdateEmpVo.java

+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author fxj
+ * @Date 2022/8/1
+ * @Description
+ * @Version 1.0
+ */
+@Data
+public class UpdateEmpVo implements Serializable {
+	// 员工身份认证
+	String empIdCard;
+	// 项目编码
+	String projectNo;
+	// 合同开始时间
+	String contractName;
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java

@@ -23,10 +23,7 @@ import com.pig4cloud.plugin.excel.vo.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDataAuth;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeInfoService;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchEmpVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpDispatchAddVo;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.ErrorMessageVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
@@ -466,5 +463,14 @@ public class TEmployeeInfoController {
 	public EmpDispatchAddVo addDispatchInfo(@RequestBody(required = true) EmpDispatchAddVo addVo) {
 		return  tEmployeeInfoService.addDispatchInfo(addVo);
 	}
-
+	/**
+	 * @Description: 派单审核通过 更新档案 合同  项目档案审核状态
+	 * @Author: fxj
+	 * @Date: 2022/08/01 18:52
+	 **/
+	@Operation(summary = "通过EMP_ID查询人员档案变更日志", description = "通过EMP_ID查询人员档案变更日志")
+	@GetMapping("/inner/updateEmpInfo")
+	public Boolean updateEmpInfo(@RequestBody UpdateEmpVo vo) {
+		return tEmployeeInfoService.updateEmpInfo(vo);
+	}
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeLogController.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeLog;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateEmpVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
@@ -143,5 +144,4 @@ public class TEmployeeLogController {
 		return R.ok(tEmployeeLogService.list(Wrappers.<TEmployeeLog>query().eq("PROJECT_ID", projectId)
 				.eq("TYPE", CommonConstants.ONE_INT).orderByDesc(CommonConstants.CREATE_TIME)));
 	}
-
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractInfoService.java

@@ -95,7 +95,9 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
 	 **/
 	R<List<ErrorMessage>> updateContract(TEmployeeContractInfo tEmployeeContractInfo);
 
-	/**
+    String getCode(boolean isNew);
+
+    /**
 	 * @param tEmployeeContractInfo
 	 * @Description: 审核
 	 * @Author: hgw

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeInfoService.java

@@ -184,4 +184,6 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
 	Map<String,DispatchEmpVo> getDispatchEmpVo(DispatchCheckVo checkVo);
 
 	EmpDispatchAddVo addDispatchInfo(EmpDispatchAddVo addVo);
+
+	Boolean updateEmpInfo(UpdateEmpVo vo);
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.*;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractExportVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractUpdateVO;
@@ -75,7 +76,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 
 	private static final String EMPINFO_IS_NOT_EXITS_BYID = "未找到人员档案与项目档案！";
 
-	private final TEmployeeInfoService tEmployeeInfoService;
+	private final TEmployeeInfoMapper tEmployeeInfoMapper;
 	private final TEmployeeProjectService tEmployeeProjectService;
 	private final TSettleDomainService tSettleDomainService;
 	private final TCustomerInfoService tCustomerInfoService;
@@ -127,7 +128,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 
 	private R<List<ErrorMessage>> setBaseInfo(TEmployeeContractInfo tEmployeeContractInfo, TEmployeeProject tEmployeeProject) {
 		// 获取人员档案
-		TEmployeeInfo tEmployeeInfo = tEmployeeInfoService.getById(tEmployeeContractInfo.getEmpId());
+		TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeContractInfo.getEmpId());
 		// 获取项目
 		if (tEmployeeProject == null) {
 			tEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query()
@@ -234,7 +235,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 	 * @Date: 2022/6/22 17:52
 	 * @return: java.lang.String
 	 **/
-	private synchronized String getCode(boolean isNew) {
+	@Override
+	public synchronized String getCode(boolean isNew) {
 		String nowDay = DateUtil.getThisDay();
 		int nowNums;
 		String empCode = null;
@@ -398,7 +400,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 
 	private void updateEmployeeContractStatus(String empId) {
 		//查看未作废合同数
-		TEmployeeInfo employeeInfo = tEmployeeInfoService.getById(empId);
+		TEmployeeInfo employeeInfo = tEmployeeInfoMapper.selectById(empId);
 		if (employeeInfo != null) {
 			employeeInfo.setContractStatus(CommonConstants.ONE_INT);
 		}
@@ -436,10 +438,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						tEmployeeProjectService.updateById(tEmployeeProject);
 					}
 					// 更新档案、项目合同状态为（1在用）
-					TEmployeeInfo tEmployeeInfo = tEmployeeInfoService.getById(contractInfo.getEmpId());
+					TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(contractInfo.getEmpId());
 					if (tEmployeeInfo != null) {
 						tEmployeeInfo.setContractStatus(CommonConstants.ONE_INT);
-						tEmployeeInfoService.updateById(tEmployeeInfo);
+						tEmployeeInfoMapper.updateById(tEmployeeInfo);
 					}
 				} else {
 					//先停用项目内的其他的员工合同————不要这个逻辑了
@@ -475,7 +477,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 					}
 
 					// 更新档案、项目合同状态为（0无合同 1在用 2不在用）
-					TEmployeeInfo tEmployeeInfo = tEmployeeInfoService.getById(contractInfo.getEmpId());
+					TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(contractInfo.getEmpId());
 					if (tEmployeeInfo != null) {
 						// 判断人员有无审核通过的其他合同
 						TEmployeeContractInfo contractInfoInUse = this.getOne(Wrappers.<TEmployeeContractInfo>query()
@@ -488,7 +490,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						} else {
 							tEmployeeInfo.setContractStatus(CommonConstants.TWO_INT);
 						}
-						tEmployeeInfoService.updateById(tEmployeeInfo);
+						tEmployeeInfoMapper.updateById(tEmployeeInfo);
 					}
 				}
 			}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -84,7 +84,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 	private final TEmpEducationService tEmpEducationService;
 	private final TSettleDomainService tSettleDomainService;
 
-	private final TEmployeeContractInfoMapper contractMapper;
+	private final TEmployeeContractInfoService contractServicer;
+
+
 
 	@Override
 	public IPage<TEmployeeInfo> getPage(Page<TEmployeeInfo> page, TEmployeeInfo employeeInfo, String sql) {
@@ -2083,6 +2085,54 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 		return addVo;
 	}
 
+	/**
+	 * @Author fxj
+	 * @Description  派单审核通过 同步人员档案 项目档案 合同状态信息
+	 * @Date 19:30 2022/8/1
+	 * @Param
+	 * @return
+	**/
+	@Override
+	public Boolean updateEmpInfo(UpdateEmpVo vo) {
+		if (Common.isEmpty(vo)){
+			if (Common.isEmpty(vo.getEmpIdCard())){
+				TEmployeeInfo employeeInfo = baseMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
+						.eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
+						.eq(TEmployeeInfo::getEmpIdcard,vo.getEmpIdCard())
+						.eq(TEmployeeInfo::getStatus,CommonConstants.ZERO_INT)
+						.last(CommonConstants.LAST_ONE_SQL));
+				if (Common.isEmpty(employeeInfo)){
+					employeeInfo.setStatus(CommonConstants.ONE_INT);
+					baseMapper.updateById(employeeInfo);
+				}
+				if (Common.isNotNull(vo.getContractName())){
+					TEmployeeContractInfo c = contractServicer.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
+							.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_INT)
+							.eq(TEmployeeContractInfo::getEmpIdcard,vo.getEmpIdCard())
+							.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.ONE_INT)
+							.eq(TEmployeeContractInfo::getContractName,vo.getContractName())
+							.last(CommonConstants.LAST_ONE_SQL));
+					if (Common.isNotNull(c)){
+						c.setAuditStatus(CommonConstants.TWO_INT);
+						contractServicer.updateById(c);
+					}
+
+				}
+				if (Common.isNotNull(vo.getProjectNo())){
+					TEmployeeProject p = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query().lambda()
+							.eq(TEmployeeProject::getDeleteFlag,CommonConstants.ONE_STRING)
+							.eq(TEmployeeProject::getEmpIdcard,vo.getEmpIdCard())
+							.eq(TEmployeeProject::getDeptNo,vo.getProjectNo())
+							.last(CommonConstants.LAST_ONE_SQL));
+					if (Common.isNotNull(p)){
+						tEmployeeProjectService.updateById(p);
+					}
+				}
+			}
+		}
+		return true;
+	}
+
 	private void saveContract(Map<String, EmpProjectDispatchVo> projectsMap,
 							  Map<String, EmpContractDispatchVo> contractsMap,
 							  Map<String, EmpAddDispatchVo> empAddsMap) {
@@ -2112,7 +2162,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 								contract.setFileTown(emp.getFileTown());
 							}
 						}
-						contractMapper.insert(contract);
+						contract.setApplyNo(contractServicer.getCode(false));
+						contractServicer.save(contract);
 						contractAdd.setId(contract.getId());
 						contractAdd.setEmpNo(contract.getEmpNo());
 						contractsMap.put(contractAdd.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + contractAdd.getDeptNo(), contractAdd);

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

@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
 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.*;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 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;
@@ -14,6 +15,7 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -162,4 +164,27 @@ public class ArchivesDaprUtil {
 		}
 		return res;
 	}
+	/**
+	 * @Author fxj
+	 * @Description  派单审核通过 同步人员档案 项目档案 合同状态信息
+	 * @Date 19:30 2022/8/1
+	 * @Param
+	 * @return
+	 **/
+	public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractName){
+		if (Common.isEmpty(empIdCard) || Common.isEmpty(projectNo) || Common.isEmpty(contractName)){
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
+		UpdateEmpVo vo = new UpdateEmpVo();
+		vo.setEmpIdCard(empIdCard);
+		vo.setProjectNo(projectNo);
+		vo.setContractName(contractName);
+		R<Boolean> res = HttpDaprUtil.invokeMethodPost(
+				daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId()
+				,"/temployeeinfo/inner/updateEmpInfo" , JSON.toJSONString(vo), UpdateEmpVo.class, SecurityConstants.FROM_IN);
+		if (Common.isEmpty(res)){
+			return R.failed("更新人员档案、项目档案、合同状态信息失败！");
+		}
+		return res;
+	}
 }

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/DispatchConstants.java

@@ -34,6 +34,14 @@ public class DispatchConstants {
 	public static final String DISPATCH_SOCIAL_REDUCE = "社保派减";
 	public static final String SOCIAL_RECORD_ROSTER_EXPORT = "社保花名册导出";
 	public static final String SOCIAL_RECORD_EXPORT = "公积金变更清册导出";
+	public static final String DISPATCH_PENSION = "养老、";
+	public static final String DISPATCH_MEDICAL = "医疗、";
+	public static final String DISPATCH_BIRTH = "生育、";
+	public static final String DISPATCH_INJURY = "工伤、";
+	public static final String DISPATCH_UNEMP = "失业、";
+	public static final String DISPATCH_BIGMAILMENT= "大病、";
+	public static final String DISPATCH_FUND= "公积金、";
+
 
 
 	/**

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java

@@ -257,8 +257,8 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 社保户
 	 */
-	@Length(max = 32, message = "社保户 不能超过32个字符" )
-	@ExcelAttribute(name = "社保户", maxLength = 32)
+	@Length(max = 50, message = "社保户 不能超过50个字符" )
+	@ExcelAttribute(name = "社保户", maxLength = 50)
 	@Schema(description = "社保户" )
 	@ExcelProperty("社保户" )
 	private String socialHousehold;
@@ -362,8 +362,8 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 公积金户
 	 */
-	@Length(max = 32, message = "公积金户 不能超过32 个字符" )
-	@ExcelAttribute(name = "公积金户", maxLength = 32)
+	@Length(max = 50, message = "公积金户 不能超过50 个字符" )
+	@ExcelAttribute(name = "公积金户", maxLength = 50)
 	@Schema(description = "公积金户" )
 	@ExcelProperty("公积金户" )
 	private String providentHousehold;

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

@@ -377,7 +377,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				continue;
 			}
 			// 新增派单信息
-			initDispatchAddInfo(user, dispatchMap, empVo, socialSet, fundSet, excel);
+			initDispatchAddInfo(user, dispatchMap, empVo, socialSet, fundSet, excel,socialFund);
 			// 变更社保公积金查询
 			initSocialFundAddInfo(socialFundAddMap, empVo, socialSet, fundSet, setInfoVo, socialFund, excel);
 		}
@@ -811,13 +811,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		return zeroArr[num] + nowNums;
 	}
 		private void initDispatchAddInfo(YifuUser user,
-									 Map<String, TDispatchInfo> dispatchMap,
-									 DispatchEmpVo empVo,
-									 SysBaseSetInfo socialSet,
-									 SysBaseSetInfo fundSet,
-									 TDispatchImportVo excel) {
+										 Map<String, TDispatchInfo> dispatchMap,
+										 DispatchEmpVo empVo,
+										 SysBaseSetInfo socialSet,
+										 SysBaseSetInfo fundSet,
+										 TDispatchImportVo excel,
+										 TSocialFundInfo socialFund) {
 		TDispatchInfo dispatch;
 		dispatch = new TDispatchInfo();
+		// 初始化派单项
+		initAddHandleItem(excel, socialFund,dispatch);
 		dispatch.setOrganName(user.getDeptName());
 		dispatch.setCreateBy(user.getId());
 		dispatch.setCreateTime(LocalDateTime.now());
@@ -892,6 +895,73 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dispatchMap.put(excel.getEmpIdcard(),dispatch);
 	}
 
+	private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch) {
+		StringBuffer temp = new StringBuffer();
+		if (Common.isEmpty(socialFund)){
+			if (Common.isNotNull(excel.getSocialHousehold())){
+				if (Common.isNotNull(excel.getPensionStart())){
+					temp.append(DispatchConstants.DISPATCH_PENSION);
+				}
+				if (Common.isNotNull(excel.getMedicalStart())){
+					temp.append(DispatchConstants.DISPATCH_MEDICAL);
+				}
+				if (Common.isNotNull(excel.getBirthStart())){
+					temp.append(DispatchConstants.DISPATCH_BIRTH);
+				}
+				if (Common.isNotNull(excel.getWorkInjuryStart())){
+					temp.append(DispatchConstants.DISPATCH_INJURY);
+				}
+				if (Common.isNotNull(excel.getUnemployStart())){
+					temp.append(DispatchConstants.DISPATCH_UNEMP);
+				}
+				if (Common.isNotNull(excel.getBigailmentStart())){
+					temp.append(DispatchConstants.DISPATCH_BIGMAILMENT);
+				}
+			}
+			if (Common.isNotNull(excel.getProvidentHousehold())){
+				temp.append(DispatchConstants.DISPATCH_FUND);
+			}
+		}
+		if (Common.isNotNull(socialFund)){
+			if (Common.isNotNull(excel.getSocialHousehold())){
+				// 办理失败或已派减  视为可派增
+				if (CommonConstants.TWO_STRING.equals(socialFund.getPensionHandle())
+						|| CommonConstants.THREE_STRING.equals(socialFund.getPensionHandle())){
+					temp.append(DispatchConstants.DISPATCH_PENSION);
+				}
+				if (CommonConstants.TWO_STRING.equals(socialFund.getMedicalHandle())
+						|| CommonConstants.THREE_STRING.equals(socialFund.getMedicalHandle())){
+					temp.append(DispatchConstants.DISPATCH_MEDICAL);
+				}
+				if (CommonConstants.TWO_STRING.equals(socialFund.getWorkInjuryHandle())
+						|| CommonConstants.THREE_STRING.equals(socialFund.getWorkInjuryHandle())){
+					temp.append(DispatchConstants.DISPATCH_INJURY);
+				}
+				if (CommonConstants.TWO_STRING.equals(socialFund.getBirthHandle())
+						|| CommonConstants.THREE_STRING.equals(socialFund.getBirthHandle())){
+					temp.append(DispatchConstants.DISPATCH_BIRTH);
+				}
+				if (CommonConstants.TWO_STRING.equals(socialFund.getUnemployHandle())
+						|| CommonConstants.THREE_STRING.equals(socialFund.getUnemployHandle())){
+					temp.append(DispatchConstants.DISPATCH_UNEMP);
+				}
+				if (CommonConstants.TWO_STRING.equals(socialFund.getBigailmentHandle())
+						|| CommonConstants.THREE_STRING.equals(socialFund.getBigailmentHandle())){
+					temp.append(DispatchConstants.DISPATCH_BIGMAILMENT);
+				}
+			}
+			//公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败9 审核不通过）、派减（5待审核 6待办理 7 办理成功 8 办理失败 ）
+			if (Common.isNotNull(excel.getProvidentHousehold())
+					&& (CommonConstants.FOUR_STRING.equals(socialFund.getFundStatus())
+					|| CommonConstants.NINE_STRING.equals(socialFund.getFundStatus())
+					|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus())
+			)){
+				temp.append(DispatchConstants.DISPATCH_FUND);
+			}
+		}
+		dispatch.setDispatchItem(temp.toString());
+	}
+
 	private boolean initFundAddInfo(List<ErrorMessage> errorMessageList,
 									Map<String, TProvidentFund> funds,
 									DispatchEmpVo empVo, SysBaseSetInfo fundSet,
@@ -1265,6 +1335,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		contract.setSettleDomain(setInfoVo.getId());
 		contract.setDeptNo(setInfoVo.getDepartNo());
 		contract.setCustomerId(setInfoVo.getCustomerId());
+		contract.setSubjectUnit(setInfoVo.getCustomerName());
+		contract.setSubjectDepart(setInfoVo.getDepartName());
 		if (Common.isNotNull(empVo)) {
 			contract.setEmpId(empVo.getId());
 			contract.setEmpNo(empVo.getEmpNo());
@@ -1898,6 +1970,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dispatch.setDeleteFlag(CommonConstants.ZERO_STRING);
 		dispatch.setReduceReason(excel.getReasonType());
 		dispatch.setTrustRemark(excel.getTrustRemark());
+		StringBuffer temp = new StringBuffer();
 		if (Common.isNotNull(excel.getSocialReduceDate())){
 			dispatch.setSocialHandleStatus(CommonConstants.ZERO_STRING);
 			dispatch.setSocialId(socialFund.getSocialId());
@@ -1909,6 +1982,25 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			socialFund.setSocialReduceDate(excel.getSocialReduceDate());
 			socialFund.setSocialReduceStatus(CommonConstants.ZERO_STRING);
 			socialFund.setSocialStatus(CommonConstants.SIX_STRING);
+			// 养老办理状态：0待办理1办理成功2办理失败3已派减
+			if (CommonConstants.ONE_STRING.equals(socialFund.getPensionHandle())){
+				temp.append(DispatchConstants.DISPATCH_PENSION);
+			}
+			if (CommonConstants.ONE_STRING.equals(socialFund.getMedicalHandle())){
+				temp.append(DispatchConstants.DISPATCH_MEDICAL);
+			}
+			if (CommonConstants.ONE_STRING.equals(socialFund.getWorkInjuryHandle())){
+				temp.append(DispatchConstants.DISPATCH_INJURY);
+			}
+			if (CommonConstants.ONE_STRING.equals(socialFund.getBirthHandle())){
+				temp.append(DispatchConstants.DISPATCH_BIRTH);
+			}
+			if (CommonConstants.ONE_STRING.equals(socialFund.getUnemployHandle())){
+				temp.append(DispatchConstants.DISPATCH_UNEMP);
+			}
+			if (CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())){
+				temp.append(DispatchConstants.DISPATCH_BIGMAILMENT);
+			}
 		}
 		if (Common.isNotNull(excel.getFundReduceDate())){
 			dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING);
@@ -1920,7 +2012,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			socialFund.setFundReduceDate(excel.getFundReduceDate());
 			socialFund.setFundStatus(CommonConstants.FIVE_STRING);
 			socialFund.setFundReduceStatus(CommonConstants.ZERO_STRING);
+			// 公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败9 审核不通过）、派减（5待审核 6待办理 7 办理成功 8 办理失败 ）
+			if (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())){
+				temp.append(DispatchConstants.DISPATCH_FUND);
+			}
 		}
+		dispatch.setDispatchItem(temp.toString());
 		dispatch.setBelongUnitName(socialFund.getUnitName());
 		dispatch.setBelongUnit(socialFund.getUnitId());
 		if (Common.isNotNull(empVo)){
@@ -2121,7 +2218,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									// 待办理
 									sf.setSocialAddStatus(CommonConstants.ONE_STRING);
 									sf.setSocialStatus(CommonConstants.ONE_STRING);
-									//派增审核不通过  需要处理预估数据
+									// 要更新 人员档案 项目档案 合同的状态信息
+									archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractName());
+								//派增审核不通过  需要处理预估数据
 								} else if (CommonConstants.ONE_INT == flag.intValue()) {
 									socialInfo.setDeleteFlag(CommonConstants.ONE_STRING);
 									// 作废更新：社保状态、同步预估数据   审核不通过直接作废
@@ -2558,34 +2657,35 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						if (Common.isNotNull(auditInfo)) {
 							//派增判断
 							if (CommonConstants.ZERO_STRING.equals(dis.getType())) {
-								if (Common.isNotNull(socialInfo)  && Common.isNotNull(providentFund)
-										&& (CommonConstants.ZERO_STRING.equals(socialInfo.getHandleStatus())
-										|| CommonConstants.FOUR_STRING.equals(socialInfo.getHandleStatus())
-										|| CommonConstants.ZERO_STRING.equals(providentFund.getHandleStatus())
-								)) {
-
-								} else {
-									if ((Common.isEmpty(dis.getSocialHandleStatus())
-											&& (CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus())
-											|| CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus())))
-											&& (Common.isEmpty(dis.getSocialHandleStatus())
-											&& (CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus()) || CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus())))) {
-										//办理成功  更新为办理完结 2020-05-26 办理失败  更新为办理完结 2020-05-26
-										dis.setStatus(CommonConstants.FOUR_STRING);
-									}
+								if ((CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus())
+										|| CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus()))
+										&& ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
+										|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
+									//办理成功
+									dis.setStatus(CommonConstants.FOUR_STRING);
+								}
+								if (Common.isEmpty(dis.getSocialHandleStatus())
+										&& ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
+										|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
+									//办理成功
+									dis.setStatus(CommonConstants.FOUR_STRING);
+								}
+								if ((CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus())
+										|| CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus()))
+										&& Common.isEmpty(dis.getFundHandleStatus())) {
+									//办理成功
+									dis.setStatus(CommonConstants.FOUR_STRING);
 								}
 								//派减判断
 							} else if (CommonConstants.ONE_STRING.equals(dis.getType())) {
-								if (null != socialInfo && null != providentFund && (
-										((CommonConstants.ONE_STRING.equals(socialInfo.getHandleStatus()) || CommonConstants.FIVE_STRING.equals(socialInfo.getHandleStatus())) && CommonConstants.ONE_STRING.equals(socialInfo.getReduceCan()))
-												|| (CommonConstants.ONE_STRING.equals(providentFund.getHandleStatus()) && CommonConstants.ONE_STRING.equals(providentFund.getReduceCan()))
-								)) {
-									//同时有社保和公积金的只要有一条没办理就不改派单状态
-								} else {
-									if (CommonConstants.ZERO_INT == flag || CommonConstants.ONE_INT == flag) {
-										//办理成功或失败  更新为办理完结 2020-05-26
-										dis.setStatus(CommonConstants.FOUR_STRING);
-									}
+								if ( !((Common.isNotNull(socialInfo)
+										&& CommonConstants.ZERO_STRING.equals(socialInfo.getHandleStatus())
+										|| CommonConstants.FOUR_STRING.equals(socialInfo.getHandleStatus()))
+										|| (Common.isEmpty(providentFund)
+										&& CommonConstants.ZERO_STRING.equals(providentFund.getHandleStatus())))
+								) {
+									//办理成功或失败  更新为办理完结 2020-05-26
+									dis.setStatus(CommonConstants.FOUR_STRING);
 								}
 							}
 							if (CommonConstants.ZERO_INT == flag) {
@@ -2707,37 +2807,37 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			// 有对应办理项且 对应项为待办理或者空时更新  下同
 			if (socialType.indexOf(CommonConstants.ONE_STRING) > CommonConstants.ZERO_INT
 					&& (Common.isEmpty(socialInfo.getPensionHandle())
-					|| CommonConstants.ONE_STRING.equals(socialInfo.getPensionHandle()))){
+					|| CommonConstants.ZERO_STRING.equals(socialInfo.getPensionHandle()))){
 				socialInfo.setPensionHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 				sf.setPensionHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 			}
 			if (socialType.indexOf(CommonConstants.TEN_STRING) > CommonConstants.ZERO_INT
 					&& (Common.isEmpty(socialInfo.getMedicalHandle())
-					|| CommonConstants.ONE_STRING.equals(socialInfo.getMedicalHandle()))){
+					|| CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle()))){
 				socialInfo.setMedicalHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 				sf.setMedicalHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 			}
 			if (socialType.indexOf(CommonConstants.THREE_STRING) > CommonConstants.ZERO_INT
 					&& (Common.isEmpty(socialInfo.getUnemployHandle())
-					|| CommonConstants.ONE_STRING.equals(socialInfo.getUnemployHandle()))){
+					|| CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle()))){
 				socialInfo.setUnemployHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 				sf.setUnemployHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 			}
 			if (socialType.indexOf(CommonConstants.FOUR_STRING) > CommonConstants.ZERO_INT
 					&& (Common.isEmpty(socialInfo.getWorkInjuryHandle())
-					|| CommonConstants.ONE_STRING.equals(socialInfo.getWorkInjuryHandle()))){
+					|| CommonConstants.ZERO_STRING.equals(socialInfo.getWorkInjuryHandle()))){
 				socialInfo.setWorkInjuryHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 				sf.setWorkInjuryHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 			}
 			if (socialType.indexOf(CommonConstants.FIVE_STRING) > CommonConstants.ZERO_INT
 					&& (Common.isEmpty(socialInfo.getBirthHandle())
-					|| CommonConstants.ONE_STRING.equals(socialInfo.getBirthHandle()))){
+					|| CommonConstants.ZERO_STRING.equals(socialInfo.getBirthHandle()))){
 				socialInfo.setBirthHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 				sf.setBirthHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 			}
 			if (socialType.indexOf(CommonConstants.SIX_STRING) > CommonConstants.ZERO_INT
 					&& (Common.isEmpty(socialInfo.getBigailmentHandle())
-					|| CommonConstants.ONE_STRING.equals(socialInfo.getBigailmentHandle()))){
+					|| CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle()))){
 				socialInfo.setBigailmentHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 				sf.setBigailmentHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
 			}