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

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

@@ -445,6 +445,27 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 	}
 
 	private void updateEmployeeContractStatus(TEmployeeContractInfo tEmployeeContractInfo) {
+		if (!CommonConstants.ZERO_STRING.equals(tEmployeeContractInfo.getInUse())) {
+			// 非作废、终止，本条变为在用
+			if (Common.isEmpty(tEmployeeContractInfo.getSituation())
+					|| (!EmployeeConstants.SITUATION_SIX.equals(tEmployeeContractInfo.getSituation())
+					&& !EmployeeConstants.SITUATION_SEVEN.equals(tEmployeeContractInfo.getSituation()))) {
+				// 其他变为不在用
+				baseMapper.updateInUseStatusById(tEmployeeContractInfo.getEmpId(), tEmployeeContractInfo.getDeptNo(), tEmployeeContractInfo.getId(), CommonConstants.ONE_STRING);
+				tEmployeeContractInfo.setAuditTimeLast(LocalDateTime.now());
+				tEmployeeContractInfo.setInUse(CommonConstants.ZERO_STRING);
+				baseMapper.updateById(tEmployeeContractInfo);
+			} else {
+				// 2022-7-22 16:54:12 产品倩倩与测试说，作废终止审核通过，仅将原先选择的合同不在用即可
+				if (Common.isNotNull(tEmployeeContractInfo.getOldContractId())) {
+					TEmployeeContractInfo old = this.getById(tEmployeeContractInfo.getOldContractId());
+					if (old != null && Common.isNotNull(old.getId()) && CommonConstants.ZERO_STRING.equals(old.getInUse())) {
+						old.setInUse(CommonConstants.ONE_STRING);
+						this.updateById(old);
+					}
+				}
+			}
+		}
 		TEmployeeInfo employeeInfo = tEmployeeInfoMapper.selectById(tEmployeeContractInfo.getEmpId());
 		if (employeeInfo != null) {
 			employeeInfo.setContractStatus(CommonConstants.ONE_INT);