优化修改

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

@@ -515,6 +515,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 				this.updateFileMainId(tEmployeeContractInfo);
 			}
 		} else {
+			// 标准合同、劳动派遣合同、其他。————社保公积金都派减，自动审核通过
+			this.judgeAuditStatus(tEmployeeContractInfo, user);
 			baseMapper.updateById(tEmployeeContractInfo);
 
 		}
@@ -1304,6 +1306,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 							&& Common.isNotNull(insert.getChangeContractAndEmployee())
 							&& CommonConstants.ZERO_STRING.equals(insert.getChangeContractAndEmployee())) {
 						changeStatus(insert, user);
+						baseMapper.updateById(insert);
 					}
 				}
 			}
@@ -1648,10 +1651,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 							TEmployeeProject tEmployeeProjectOld = tEmployeeProjectService.getById(tEmployeeProject.getId());
 							tEmployeeProject.setContractStatus(CommonConstants.TWO_INT);
 							//如果该项目仍有社保、公积金的数据不同步减项，如正常减项，记录项目档案操作记录
-							if (tEmployeeProject.getSocialStatus() == CommonConstants.ZERO_INT
-									|| tEmployeeProject.getSocialStatus() == CommonConstants.FOUR_INT
-									|| tEmployeeProject.getFundStatus() == CommonConstants.ZERO_INT
-									|| tEmployeeProject.getFundStatus() == CommonConstants.FOUR_INT) {
+							if ((tEmployeeProject.getSocialStatus() == CommonConstants.ZERO_INT
+									|| tEmployeeProject.getSocialStatus() == CommonConstants.FOUR_INT) &&
+									( tEmployeeProject.getFundStatus() == CommonConstants.ZERO_INT
+									|| tEmployeeProject.getFundStatus() == CommonConstants.THREE_INT)) {
 								tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT);
 								tEmployeeProject.setLeaveRemark("终止合同联动减项");
 								tEmployeeProject.setLeaveTime(LocalDateTime.now());
@@ -1915,7 +1918,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			if ((tEmployeeProject.getSocialStatus() == CommonConstants.ZERO_INT
 					|| tEmployeeProject.getSocialStatus() == CommonConstants.FOUR_INT)
 					&& (tEmployeeProject.getFundStatus() == CommonConstants.ZERO_INT
-					|| tEmployeeProject.getFundStatus() == CommonConstants.FOUR_INT)) {
+					|| tEmployeeProject.getFundStatus() == CommonConstants.THREE_INT)) {
 				tEmployeeProject.setProjectStatus(CommonConstants.ONE_INT);
 				tEmployeeProject.setLeaveRemark("终止合同联动减项");
 				tEmployeeProject.setLeaveTime(LocalDateTime.now());