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

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

@@ -1658,6 +1658,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 								tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT);
 								tEmployeeProject.setLeaveRemark("终止合同联动减项");
 								tEmployeeProject.setLeaveTime(LocalDateTime.now());
+								tEmployeeProject.setLeaveUser(user.getNickname());
 								workInfo.append("减项成功,");
 							} else {
 								failueInfo.append("存在社保/公积金，无法减项");
@@ -1688,7 +1689,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 									if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
 										//减档
 										tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
-										tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark());
+										tEmployeeInfo.setLeaveRemark("社保派减联动减档");
 										tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
 										tEmployeeInfo.setLeaveUser(user.getId());
 										tEmployeeInfo.setLeaveUserName(user.getNickname());

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

@@ -1483,8 +1483,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 						(tEmployeeProject.getFundStatus() == CommonConstants.ZERO_INT
 						|| tEmployeeProject.getFundStatus() == CommonConstants.THREE_INT)) {
 					tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT);
-					tEmployeeProject.setLeaveRemark("终止合同联动减项");
+					tEmployeeProject.setLeaveRemark("社保派减联动减项");
 					tEmployeeProject.setLeaveTime(LocalDateTime.now());
+					tEmployeeProject.setLeaveUser(vo.getUserName());
 					workInfo.append("减项成功,");
 				} else {
 					failueInfo.append("存在社保/公积金，无法减项");
@@ -1516,7 +1517,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 						if (tEmployeeInfo.getProjectNum() == CommonConstants.ZERO_INT) {
 							//减档
 							tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
-							tEmployeeInfo.setLeaveRemark(tEmployeeProject.getLeaveRemark());
+							tEmployeeInfo.setLeaveRemark("社保派减联动减档");
 							tEmployeeInfo.setLeaveTime(DateUtil.getCurrentDateTime());
 							tEmployeeInfo.setLeaveUser(vo.getUserId());
 							tEmployeeInfo.setLeaveUserName(vo.getUserName());

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

@@ -2792,7 +2792,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			//单减社保，判断是否有正常的公积金
 			if (Common.isNotNull(excel.getSocialReduceDate()) && Common.isEmpty(excel.getFundReduceDate())
 					&& (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())
-					|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus()))
+					|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus())
+					|| CommonConstants.ZERO_STRING.equals(socialFund.getFundStatus())
+					|| CommonConstants.ONE_STRING.equals(socialFund.getFundStatus())
+					|| CommonConstants.FIVE_STRING.equals(socialFund.getFundStatus())
+					|| CommonConstants.SIX_STRING.equals(socialFund.getFundStatus()))
 					&& CommonConstants.ZERO_STRING.equals(excel.getChangeContractAndEmployee())) {
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_FUND_NOT_EMPTY_CHANGE)));
 				continue;