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

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

@@ -529,6 +529,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						// 判断人员有无审核通过的其他合同
 						TEmployeeContractInfo contractInfoInUse = this.getOne(Wrappers.<TEmployeeContractInfo>query()
 								.lambda().eq(TEmployeeContractInfo::getEmpId, contractInfo.getEmpId())
+								.and(obj->obj.ge(TEmployeeContractInfo::getContractEnd,DateUtil.getThisDayByPatten("yyyy-MM-dd"))
+										.or().isNull(TEmployeeContractInfo::getContractEnd))
 								.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_INT)
 								.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
 								.last(CommonConstants.LAST_ONE_SQL));

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java

@@ -1471,6 +1471,18 @@ public class DateUtil {
 		return thisYear - years + 1;
 	}
 
+	/**
+	 * @param patten 格式
+	 * @Description: 获取今天
+	 * @Author: hgw
+	 * @Date: 2022/11/28 18:06
+	 * @return: java.lang.String
+	 **/
+	public static String getThisDayByPatten(String patten){
+		SimpleDateFormat sf = new SimpleDateFormat(patten);
+		return sf.format(new Date());
+	}
+
 	 /**
 	  * @Description: 返回当前年月日字符串
 	  * @Author: hgw