优化修改

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

@@ -46,4 +46,6 @@ public class UpProjectSocialFundVo implements Serializable {
 	String mobile;
 	//是否同步终止合同、减项、减档 0 是 1 否
 	String changeContractAndEmployee;
+	String userName;
+	String userId;
 }

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

@@ -771,10 +771,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 							TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(tEmployeeProject.getId());
 							tEmployeeProject.setContractStatus(CommonConstants.TWO_INT);
 							//如果该项目仍有社保、公积金的数据不同步减项，如正常减项，记录项目档案操作记录
-							if (tEmployeeProject.getSocialStatus() == CommonConstants.ZERO_INT
-									|| tEmployeeProject.getSocialStatus() == CommonConstants.FOUR_INT
-									|| tEmployeeProject.getFundStatus() == CommonConstants.ZERO_INT
-									|| tEmployeeProject.getFundStatus() == CommonConstants.FOUR_INT) {
+							if ((tEmployeeProject.getSocialStatus() == CommonConstants.ZERO_INT
+									|| tEmployeeProject.getSocialStatus() == CommonConstants.FOUR_INT)
+									&& (tEmployeeProject.getFundStatus() == CommonConstants.ZERO_INT
+									|| tEmployeeProject.getFundStatus() == CommonConstants.FOUR_INT)) {
 								tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT);
 								tEmployeeProject.setLeaveRemark("终止合同联动减项");
 								tEmployeeProject.setLeaveTime(LocalDateTime.now());

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

@@ -3929,6 +3929,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								//派减审核通过才会处理合同档案状态
 								if (CommonConstants.ONE_INT == flag) {
 									vo.setChangeContractAndEmployee(dis.getChangeContractAndEmployee());
+									vo.setUserId(user.getId());
+									vo.setUserName(user.getNickname());
 								}
 								R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
 								if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()){