1.5.7-划转，减项的可划转-项目档案，划转成功

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

@@ -435,8 +435,8 @@ 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));
-		// hgw 2023-8-21 16:31:18 目标项目是否已减项false:否。——2023-8-23 18:02:57 改为 目标的单个服务项 已派减，可以划过去
-		//boolean isSubtraction = false
+		// hgw 2023-8-24 16:07:01 值为3，表示什么服务都没有，加提示语：项目档案，划转成功
+		int isNoService = 0;
 		if (Common.isNotNull(newEmpProject)
 				&& Common.isNotNull(newEmpProject.getProjectStatus())
 				&& newEmpProject.getProjectStatus().intValue() == CommonConstants.ONE_INT){
@@ -516,6 +516,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			if (vo.getChangeItems().indexOf(CommonConstants.ONE_STRING) >= CommonConstants.ZERO_INT) {
 				if (Common.isEmpty(oldEmpProject.getSocialStatus())
 						|| CommonConstants.ZERO_INT == oldEmpProject.getSocialStatus()){
+					isNoService++;
 					resStr.append("社保项不存在，无法划转! <br>");
 				}else {
 					if (Common.isEmpty(newEmpProject.getSocialStatus())
@@ -541,6 +542,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			if (vo.getChangeItems().indexOf(CommonConstants.TWO_STRING) >= CommonConstants.ZERO_INT) {
 				if (Common.isEmpty(oldEmpProject.getFundStatus())
 						|| CommonConstants.ZERO_INT == oldEmpProject.getFundStatus()){
+					isNoService++;
 					resStr.append("公积金项不存在，无法划转! <br>");
 				}else{
 					if (Common.isEmpty(newEmpProject.getFundStatus())
@@ -560,6 +562,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 			if (vo.getChangeItems().indexOf(CommonConstants.ZERO_STRING) >= CommonConstants.ZERO_INT){
 				if (Common.isEmpty(oldEmpProject.getContractStatus())
 						|| CommonConstants.ZERO_INT == oldEmpProject.getContractStatus()){
+					isNoService++;
 					resStr.append("员工合同不存在，无法划转! <br>");
 				}else {
 					if (Common.isEmpty(newEmpProject.getContractStatus())
@@ -575,10 +578,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 					}
 				}
 			}
-			/*if (isSubtraction) {
-				oldEmpProject.setProjectStatus(CommonConstants.ONE_INT)
-				newEmpProject.setProjectStatus(CommonConstants.ZERO_INT)
-			}*/
+			if (isNoService == 3) {
+				resStr.append("项目档案，划转成功! <br>");
+			}
 			// 变更老的项目档案
 			tEmployeeProjectService.updateChangeById(oldEmpProject);
 			//新增或变更新的项目档案