1、7556续签结束日期不能小于续签开始日期

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java

@@ -97,6 +97,7 @@ public interface ErrorCodeConstants {
     ErrorCode OA_CONVERSION_NOT_EXISTS = new ErrorCode(1_009_017_002, "转正信息不存在");
     // ========== 合同续签流程信息 1_009_017_003 ==========
     ErrorCode OA_RENEW_NOT_EXISTS = new ErrorCode(1_009_017_003, "合同续签信息不存在");
+    ErrorCode OA_RENEW_CONTRACT_START_DATE_GREATER_THAN_END_DATE = new ErrorCode(1_009_017_003, "续签结束日期不能早于续签开始日期");
     // ========== 离职流程信息 1_009_017_004 ==========
     ErrorCode OA_TURNOVER_NOT_EXISTS = new ErrorCode(1_009_017_004, "离职信息不存在");
     // ========== 请假流程信息 1_009_017_005 ==========

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/renew/OaRenewServiceImpl.java

@@ -114,6 +114,14 @@ public class OaRenewServiceImpl implements OaRenewService {
         if (loginEmployee == null || (stagingReqVO.getEmployeeId() != null && employee == null)) {
             throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
         }
+        // 续签结束日期不能小于续签开始日期
+        String renewContractStartDate = stagingReqVO.getRenewContractStartDate();
+        String renewContractEndDate = stagingReqVO.getRenewContractEndDate();
+        if (StrUtil.isNotBlank(renewContractStartDate) && StrUtil.isNotBlank(renewContractEndDate)) {
+            if (renewContractStartDate.compareTo(renewContractEndDate) > 0) {
+                throw exception(ErrorCodeConstants.OA_RENEW_CONTRACT_START_DATE_GREATER_THAN_END_DATE);
+            }
+        }
 
         OaRenewDO oaRenew = BeanUtils.toBean(stagingReqVO, OaRenewDO.class);
         if (StringUtils.isBlank(oaRenew.getRenewId())) {
@@ -175,6 +183,14 @@ public class OaRenewServiceImpl implements OaRenewService {
         if (loginEmployee == null || employee == null) {
             throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
         }
+        // 续签结束日期不能小于续签开始日期
+        String renewContractStartDate = commitReqVO.getRenewContractStartDate();
+        String renewContractEndDate = commitReqVO.getRenewContractEndDate();
+        if (StrUtil.isNotBlank(renewContractStartDate) && StrUtil.isNotBlank(renewContractEndDate)) {
+            if (renewContractStartDate.compareTo(renewContractEndDate) > 0) {
+                throw exception(ErrorCodeConstants.OA_RENEW_CONTRACT_START_DATE_GREATER_THAN_END_DATE);
+            }
+        }
 
 
         OaRenewDO oaRenew = BeanUtils.toBean(commitReqVO, OaRenewDO.class);
@@ -505,6 +521,14 @@ public class OaRenewServiceImpl implements OaRenewService {
         if (loginEmployee == null || employee == null) {
             throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
         }
+        // 续签结束日期不能小于续签开始日期
+        String renewContractStartDate = reCommitReqVO.getRenewContractStartDate();
+        String renewContractEndDate = reCommitReqVO.getRenewContractEndDate();
+        if (StrUtil.isNotBlank(renewContractStartDate) && StrUtil.isNotBlank(renewContractEndDate)) {
+            if (renewContractStartDate.compareTo(renewContractEndDate) > 0) {
+                throw exception(ErrorCodeConstants.OA_RENEW_CONTRACT_START_DATE_GREATER_THAN_END_DATE);
+            }
+        }
 
         OaRenewDO oaRenewNew = BeanUtils.toBean(reCommitReqVO, OaRenewDO.class);
         OaRenewDO oaRenewOld = validateOaRenewExists(oaRenewNew.getId());