From 6d60f219aa4600bbf75a9a3c5d4ec90ed659c602 Mon Sep 17 00:00:00 2001
From: huyuchen <chainahyc2021@126.com>
Date: Mon, 24 Mar 2025 15:12:37 +0800
Subject: [PATCH] =?UTF-8?q?huych-=E5=85=A5=E8=81=8C=E7=99=BB=E8=AE=B0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archives/service/impl/TPreEmpMainServiceImpl.java  |  8 ++++----
 .../service/impl/EmployeeRegistrationServiceImpl.java  |  3 ++-
 .../social/service/impl/TDispatchInfoServiceImpl.java  | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java b/yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
index 23d142136..81624a7d2 100644
--- a/yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+++ b/yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
@@ -1574,6 +1574,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 					// 有信息,就跳转到待审核
 					if (pre != null && Common.isNotNull(pre.getId()) && CommonConstants.ONE_STRING.equals(status)) {
 						main.setStatus(CommonConstants.TWO_STRING);
+						if (Common.isEmpty(pre.getProcessStatus()) || CommonConstants.ONE_STRING.equals(pre.getProcessStatus())) {
+							pre.setProcessStatus(CommonConstants.TWO_STRING);
+							registrationPreService.updateById(pre);
+						}
 						if (isSimpleBoo) {
 							main.setStatus(CommonConstants.FOUR_STRING);
 							// 审核日志
@@ -1587,10 +1591,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
 							tPreEmpMainLogService.save(auditLog);
 							updateToEmployeeByPre(vo, isSimpleBoo);
 						}
-						if (Common.isEmpty(pre.getProcessStatus()) || CommonConstants.ONE_STRING.equals(pre.getProcessStatus())) {
-							pre.setProcessStatus(CommonConstants.TWO_STRING);
-							registrationPreService.updateById(pre);
-						}
 					}
 					main.setStatus(status);
 					main.setCreateBy(user.getId());
diff --git a/yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java b/yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
index 6af8c9d5f..da03cab1f 100644
--- a/yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+++ b/yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
@@ -692,8 +692,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
 	@Override
 	public R batchUpdatePreById(List<EmployeeRegistrationReceiveVo> employeeRegistList) {
 		YifuUser user = SecurityUtils.getUser();
+		EmployeeRegistration registrationNow;
 		for (EmployeeRegistrationReceiveVo vo : employeeRegistList) {
-			EmployeeRegistration registrationNow = baseMapper.selectById(vo.getId());
+			registrationNow = baseMapper.selectById(vo.getId());
 			if (Common.isEmpty(registrationNow) || !CommonConstants.ONE_STRING.equals(registrationNow.getProcessStatus())) {
 				return R.failed(RegistConstants.NO_DATA_TO_HANDLE);
 			}
diff --git a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
index 97217ba6e..affc670ab 100644
--- a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+++ b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
@@ -4808,11 +4808,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				// 派减部分办理失败
 				socialInfo.setHandleStatus(CommonConstants.SEVEN_STRING);
 				if ((Common.isEmpty(sf.getPensionHandle()) || CommonConstants.TWO_STRING.equals(sf.getPensionHandle()) || CommonConstants.THREE_STRING.equals(sf.getPensionHandle()))
-						 || (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.TWO_STRING.equals(sf.getMedicalHandle()) || CommonConstants.THREE_STRING.equals(sf.getMedicalHandle()))
-						|| (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.TWO_STRING.equals(sf.getUnemployHandle()) || CommonConstants.THREE_STRING.equals(sf.getUnemployHandle()))
-						|| (Common.isEmpty(sf.getWorkInjuryHandle()) || CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle()))
-						|| (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle()))
-						|| (Common.isEmpty(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))) {
+						 && (Common.isEmpty(sf.getMedicalHandle()) || CommonConstants.TWO_STRING.equals(sf.getMedicalHandle()) || CommonConstants.THREE_STRING.equals(sf.getMedicalHandle()))
+						&& (Common.isEmpty(sf.getUnemployHandle()) || CommonConstants.TWO_STRING.equals(sf.getUnemployHandle()) || CommonConstants.THREE_STRING.equals(sf.getUnemployHandle()))
+						&& (Common.isEmpty(sf.getWorkInjuryHandle()) || CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle()))
+						&& (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()) || CommonConstants.THREE_STRING.equals(sf.getBirthHandle()))
+						&& (Common.isEmpty(sf.getBigailmentHandle()) || CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))) {
 					sf.setSocialStatus(CommonConstants.EIGHT_STRING);
 					sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
 				} else {
-- 
2.18.1