From 978c1f6f9ee45914f5c013af6ee8f5da7983da44 Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Wed, 16 Jul 2025 09:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8F=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/property/domain/AttendanceShift.java    |  4 ++--
 .../property/domain/constant/StatusConstant.java    | 13 +++++++++++++
 .../service/impl/AttendanceShiftServiceImpl.java    |  3 ++-
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/constant/StatusConstant.java

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java
index d651ed9..8a7b2ec 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java
@@ -50,12 +50,12 @@ public class AttendanceShift extends TenantEntity {
     /**
      * 状态（0：off，1：on）
      */
-    private Long status;
+    private Integer status;
 
     /**
      * 是否休息（0：不休息，1：休息）
      */
-    private Long isRest;
+    private Integer isRest;
 
     /**
      * 休息开始时间
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/constant/StatusConstant.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/constant/StatusConstant.java
new file mode 100644
index 0000000..a010878
--- /dev/null
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/constant/StatusConstant.java
@@ -0,0 +1,13 @@
+package org.dromara.property.domain.constant;
+
+/**
+ * 状态常量，启用或者禁用
+ */
+public class StatusConstant {
+
+    //是否休息：is_rest 1休息 0不休息
+    public static final Integer REST = 1;
+    public static final Integer DONTREST = 0;
+
+
+}
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java
index 57228d8..9b16d4d 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.constant.StatusConstant;
 import org.springframework.stereotype.Service;
 import org.dromara.property.domain.bo.AttendanceShiftBo;
 import org.dromara.property.domain.vo.AttendanceShiftVo;
@@ -94,7 +95,7 @@ public class AttendanceShiftServiceImpl implements IAttendanceShiftService {
     public Boolean insertByBo(AttendanceShiftBo bo) {
         AttendanceShift add = MapstructUtils.convert(bo, AttendanceShift.class);
         //判断参数is_rest是否为0（不休息），如果是，则设置rest_start_time和rest_end_time为空
-        if(add.getIsRest() == 0){
+        if(add.getIsRest() == StatusConstant.DONTREST){
             add.setRestStartTime(null);
             add.setRestEndTime(null);
         }