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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

@@ -312,8 +312,9 @@ public class TEmployeeProject extends BaseEntity {
 
 	/**
 	 * 公积金状态（字典）
+	 * 0无公积金;1处理中;2正常;3已派减
 	 */
-	@Schema(description = "公积金状态（字典）: 0 无公积金 1 处理中 2.部分购买 3.正常 4.已派减")
+	@Schema(description = "公积金状态（字典）: 0无公积金;1处理中;2正常;3已派减")
 	private Integer fundStatus;
 
 	/**

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

@@ -435,13 +435,13 @@ 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:否
-		boolean isSubtraction = false;
+		// hgw 2023-8-21 16:31:18 目标项目是否已减项false:否。——2023-8-23 18:02:57 改为 目标的单个服务项 已派减，可以划过去
+		//boolean isSubtraction = false
 		if (Common.isNotNull(newEmpProject)
 				&& Common.isNotNull(newEmpProject.getProjectStatus())
 				&& newEmpProject.getProjectStatus().intValue() == CommonConstants.ONE_INT){
-			isSubtraction = true;
-			//return R.failed("目标项目档案已减项，请复项后重新划转！")
+			//isSubtraction = true
+			return R.failed("目标项目档案已减项，请复项后重新划转！");
 		}
 		//社保公积金派单处需要直接修改为最新的项目
 		//社保预估库、缴费库、对比库、代理差额库，需要同步修改未结算（并且满足这个条件：数据 生成月≥此处划转起始月）的数据，已结算数据不变更；
@@ -519,7 +519,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 					resStr.append("社保项不存在，无法划转! <br>");
 				}else {
 					if (Common.isEmpty(newEmpProject.getSocialStatus())
-							|| CommonConstants.ZERO_INT == newEmpProject.getSocialStatus()){
+							|| CommonConstants.ZERO_INT == newEmpProject.getSocialStatus()
+							|| CommonConstants.FOUR_INT == newEmpProject.getSocialStatus()){
 						newEmpProject.setSocialStatus(oldEmpProject.getSocialStatus());
 						newEmpProject.setSocialProvince(oldEmpProject.getSocialProvince());
 						newEmpProject.setSocialCity(oldEmpProject.getSocialCity());
@@ -543,13 +544,14 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 					resStr.append("公积金项不存在，无法划转! <br>");
 				}else{
 					if (Common.isEmpty(newEmpProject.getFundStatus())
-							|| CommonConstants.ZERO_INT == newEmpProject.getFundStatus()){
+							|| CommonConstants.ZERO_INT == newEmpProject.getFundStatus()
+							|| CommonConstants.THREE_INT == newEmpProject.getFundStatus()){
 						newEmpProject.setFundStatus(oldEmpProject.getFundStatus());
 						updatesf.setFlag(CommonConstants.ONE_STRING);
 						socialDaprUtils.updateSocialAndFoundInfo(updatesf);
 						oldEmpProject.setFundStatus(CommonConstants.ZERO_INT);
 						resStr.append("公积金划转成功! <br>");
-					}else {
+					} else {
 						resStr.append("目标项目档案存在公积金数据，公积金划转失败! <br>");
 					}
 				}
@@ -573,10 +575,10 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 					}
 				}
 			}
-			if (isSubtraction) {
-				oldEmpProject.setProjectStatus(CommonConstants.ONE_INT);
-				newEmpProject.setProjectStatus(CommonConstants.ZERO_INT);
-			}
+			/*if (isSubtraction) {
+				oldEmpProject.setProjectStatus(CommonConstants.ONE_INT)
+				newEmpProject.setProjectStatus(CommonConstants.ZERO_INT)
+			}*/
 			// 变更老的项目档案
 			tEmployeeProjectService.updateChangeById(oldEmpProject);
 			//新增或变更新的项目档案