30号版本：档案合同、商险、薪资状态；缴费库反馈列；合同提交的直接审核优化等

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

@@ -344,7 +344,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 		this.setAuditInfo(tEmployeeContractInfo);
 
 		// 更新档案合同状态
-		this.updateEmployeeContractStatus(tEmployeeContractInfo.getEmpId());
+		if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.TWO_INT) {
+			this.updateEmployeeContractStatus(tEmployeeContractInfo);
+		}
 		return R.ok(null, CommonConstants.SAVE_SUCCESS);
 	}
 
@@ -442,11 +444,42 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 		tEmployeeContractAuditService.save(audit);
 	}
 
-	private void updateEmployeeContractStatus(String empId) {
-		//查看未作废合同数
-		TEmployeeInfo employeeInfo = tEmployeeInfoMapper.selectById(empId);
+	private void updateEmployeeContractStatus(TEmployeeContractInfo tEmployeeContractInfo) {
+		TEmployeeInfo employeeInfo = tEmployeeInfoMapper.selectById(tEmployeeContractInfo.getEmpId());
 		if (employeeInfo != null) {
 			employeeInfo.setContractStatus(CommonConstants.ONE_INT);
+			if (Common.isNotNull(tEmployeeContractInfo.getSituation())
+					&& (EmployeeConstants.SITUATION_SIX.equals(tEmployeeContractInfo.getSituation())
+					|| EmployeeConstants.SITUATION_SEVEN.equals(tEmployeeContractInfo.getSituation()))) {
+				TEmployeeContractInfo contractInfoInUse = this.getOne(Wrappers.<TEmployeeContractInfo>query()
+						.lambda().eq(TEmployeeContractInfo::getEmpId, tEmployeeContractInfo.getEmpId())
+						.and(obj -> obj.ge(TEmployeeContractInfo::getContractEnd, DateUtil.getThisDayByPatten("yyyy-MM-dd"))
+								.or().isNull(TEmployeeContractInfo::getContractEnd))
+						.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
+						.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_INT)
+						.last(CommonConstants.LAST_ONE_SQL));
+				if (contractInfoInUse != null) {
+					employeeInfo.setContractStatus(CommonConstants.ONE_INT);
+				} else {
+					employeeInfo.setContractStatus(CommonConstants.TWO_INT);
+				}
+			}
+			tEmployeeInfoMapper.updateById(employeeInfo);
+		}
+		TEmployeeProject tEmployeeProject = tEmployeeProjectService.getOne(Wrappers.<TEmployeeProject>query()
+				.lambda().eq(TEmployeeProject::getEmpId, tEmployeeContractInfo.getEmpId())
+				.eq(TEmployeeProject::getDeptId, tEmployeeContractInfo.getSettleDomain())
+				.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT)
+				.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
+				.last(CommonConstants.LAST_ONE_SQL));
+		if (tEmployeeProject != null) {
+			tEmployeeProject.setContractStatus(CommonConstants.ONE_INT);
+			if (Common.isNotNull(tEmployeeContractInfo.getSituation())
+					&& (EmployeeConstants.SITUATION_SIX.equals(tEmployeeContractInfo.getSituation())
+					|| EmployeeConstants.SITUATION_SEVEN.equals(tEmployeeContractInfo.getSituation()))) {
+				tEmployeeProject.setContractStatus(CommonConstants.TWO_INT);
+			}
+			tEmployeeProjectService.updateById(tEmployeeProject);
 		}
 	}
 	@Override