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

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

@@ -395,6 +395,10 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 		TEmployeeProject newEmpProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query().lambda()
 				.eq(TEmployeeProject::getEmpIdcard, vo.getEmpIdcard()).eq(TEmployeeProject::getDeptNo,vo.getNewDeptNo())
 				.eq(TEmployeeProject::getDeleteFlag,CommonConstants.STATUS_NORMAL));
+		if (Common.isNotNull(newEmpProject.getProjectStatus())
+				&& newEmpProject.getProjectStatus().intValue() == CommonConstants.ONE_INT){
+			return R.failed("目标项目档案已减项，请复项后重新划转！");
+		}
 		//社保公积金派单处需要直接修改为最新的项目
 		//社保预估库、缴费库、对比库、代理差额库，需要同步修改未结算（并且满足这个条件：数据 生成月≥此处划转起始月）的数据，已结算数据不变更；
 		//划转,更新项目信息
@@ -496,7 +500,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			// 处理員工合同  目标 已有合同状态 不在处理合同划转
 			if (vo.getChangeItems().indexOf(CommonConstants.ZERO_STRING) >= CommonConstants.ZERO_INT){
 				if (Common.isEmpty(newEmpProject.getContractStatus())
-						|| CommonConstants.ZERO_INT != newEmpProject.getContractStatus()){
+						|| CommonConstants.ZERO_INT == newEmpProject.getContractStatus()){
 					newEmpProject.setContractStatus(oldEmpProject.getContractStatus());
 					newEmpProject.setContractType(oldEmpProject.getContractType());
 					// 合同同步划转---只划转在用合同 fxj 2023-03-06

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

@@ -5338,6 +5338,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				}
 				//办理成功处理
 				if (socialSucessType.length() > 1) {
+					if (!CommonConstants.TWO_STRING.equals(dispatch.getStatus())) {
+						continue;
+					}
 					// 执行数据插入操作 组装
 					messageList = addBatchApplyHandle(Collections.singletonList(dispatch.getId()), CommonConstants.ZERO_STRING, user
 							, 0, CommonConstants.ONE_STRING, ServiceUtil.ifNullToEmpty(excel.getRemark()), socialSucessType.substring(0, socialSucessType.length() - 1), ServiceUtil.ifNullToEmpty(excel.getRemark()));
@@ -5351,6 +5354,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				}
 				//办理失败处理
 				if (socialFailureType.length() > 1) {
+					if (!CommonConstants.TWO_STRING.equals(dispatch.getStatus())) {
+						continue;
+					}
 					// 执行数据插入操作 组装
 					messageList = addBatchApplyHandle(Collections.singletonList(dispatch.getId()), CommonConstants.ZERO_STRING, user
 							, 1, CommonConstants.TWO_STRING, handlerRemaek + ServiceUtil.ifNullToEmpty(excel.getRemark()), socialFailureType.substring(0, socialFailureType.length() - 1), handlerRemaek + ServiceUtil.ifNullToEmpty(excel.getRemark()));

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

@@ -1895,7 +1895,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			userId = user.getId();
 			userName = user.getNickname();
 		}
-		TForecastLibrary library1;
+
 		for (TForecastLibrary library : saveLibraryMap.values()) {
 			if (Common.isEmpty(library.getSocialId()) && Common.isEmpty(library.getProvidentId())) {
 				continue;