From 83d3fdb3236fd231126fa70a93bc7ced7c9f4bbd Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Mon, 11 Nov 2024 17:29:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E5=8A=B3?=
 =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=90=8C=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改劳动合同状态常量，提高代码可读性
- 修正合同到期状态判断逻辑- 更新合同状态更新方法，使用正确的新状态
---
 .../dataobject/laborcontract/LaborContractDO.java   | 10 +++++++++-
 .../module/system/job/birthday/BirthdayJob.java     |  2 +-
 .../laborcontract/LaborContractServiceImpl.java     | 13 +++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/laborcontract/LaborContractDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/laborcontract/LaborContractDO.java
index 03733975..acbb10e9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/laborcontract/LaborContractDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/laborcontract/LaborContractDO.java
@@ -25,6 +25,14 @@ import java.util.List;
 @AllArgsConstructor
 public class LaborContractDO extends BaseDO {
 
+    /**
+     * 状态  0待签 1过期 2已签 3离职
+     */
+    public static final Integer STATUS_WAIT_SIGN = 0;
+    public static final Integer STATUS_EXPIRE = 1;
+    public static final Integer STATUS_SIGN = 2;
+    public static final Integer STATUS_LEAVE = 3;
+
     /**
      * id
      */
@@ -55,7 +63,7 @@ public class LaborContractDO extends BaseDO {
      */
     private Integer probationPeriodTime;
     /**
-     * 状态  0待签 2过期 3已签 4离职
+     * 状态  0待签 1过期 2已签 3离职
      */
     private Integer status;
     /**
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java
index 1e49e5ce..45d93e09 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java
@@ -95,7 +95,7 @@ public class BirthdayJob {
         if (CollectionUtil.isNotEmpty(laborContractDOS)) {
 
             // 修改合同状态为过期
-            laborContractService.updateLaborContractList(convertList(laborContractDOS, LaborContractDO::getId), 2);
+            laborContractService.updateLaborContractList(convertList(laborContractDOS, LaborContractDO::getId), LaborContractDO.STATUS_EXPIRE);
 
             for (AdminUserDO adminUserDO : userDOs) {
                 if( adminUserDO.getOpenId() != null && !adminUserDO.getOpenId().isEmpty()) {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java
index 9dd84289..0ac4f377 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java
@@ -50,7 +50,16 @@ public class LaborContractServiceImpl implements LaborContractService {
         LaborContractDO laborContract = BeanUtils.toBean(createReqVO, LaborContractDO.class);
         // 设置到期时间
         laborContract.setExpirationDate(laborContract.getSigningDate().plusYears(laborContract.getContractDuration()));
-        laborContract.setStatus(2);
+
+        // 判断到期时间是否小于当前日期
+        if (laborContract.getExpirationDate().isBefore(LocalDate.now())) {
+            // 设置合同状态为过期
+            laborContract.setStatus(LaborContractDO.STATUS_EXPIRE);
+        }else {
+            // 设置合同状态为 已签
+            laborContract.setStatus(LaborContractDO.STATUS_SIGN);
+        }
+
         laborContractMapper.insert(laborContract);
 
         // 返回
@@ -130,7 +139,7 @@ public class LaborContractServiceImpl implements LaborContractService {
 
         return laborContractMapper.selectList(new LambdaQueryWrapperX<LaborContractDO>()
                 .lt(LaborContractDO::getExpirationDate, now)
-                .eq(LaborContractDO::getStatus, 3));
+                .eq(LaborContractDO::getStatus, LaborContractDO.STATUS_SIGN));
     }
 
     @Override