From 66721b34cd9b73a5c782769d28cf0b65dbb2d53f Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Wed, 6 Aug 2025 16:47:46 +0800
Subject: [PATCH] 1

---
 .../AttendanceArrangementServiceImpl.java     | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java
index b57b6b20..e7838ac5 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java
@@ -67,9 +67,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
         //将排班人员信息添加到排班信息中
         AttendanceArrangementVo vo = baseMapper.selectVoById(id);
         vo.setUserGroupList(userGroupList);
-
-
-        return baseMapper.selectVoById(id);
+        return vo;
     }
 
     /**
@@ -318,8 +316,6 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
 //        // 2. 根据日历的开始时间和结束时间查询出每一天的排班信息
 //        // 2.1 循环日历的开始时间和结束时间，判断 calendarStartDate 在哪些排班中
 //        List<AttendanceArrangementVo> result = new ArrayList<>();
-//
-//
 //        //查询所有排班信息
 //        List<AttendanceArrangement> arrangementList1 = baseMapper.selectList();
 //        //取出排班的开始时间和结束时间
@@ -335,25 +331,16 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
 //            if (count >= startDateList.size() || count >= endDateList.size()){
 //                continue;
 //            }
-//
-//
-//
 ////            // 查询指定日期在哪些排班中
 ////            List<AttendanceArrangement> arrangementList = baseMapper.selectList(
 ////                Wrappers.<AttendanceArrangement>lambdaQuery()
 ////                    .between(AttendanceArrangement::getStartDate, date.atStartOfDay(ZoneId.systemDefault()).toInstant(),
 ////                        date.atStartOfDay(ZoneId.systemDefault()).plusDays(1).toInstant().minusSeconds(1)));
-//
-//
 //            // 查询指定日期在哪些排班中
 //            List<AttendanceArrangement> arrangementList = baseMapper.selectList(
 //                Wrappers.<AttendanceArrangement>lambdaQuery()
 //                    .between(AttendanceArrangement::getStartDate, startDateList.get(count).atStartOfDay(ZoneId.systemDefault()).toInstant(),
 //                        endDateList.get(count).atStartOfDay(ZoneId.systemDefault()).plusDays(1).toInstant().minusSeconds(1)));
-//
-//
-//
-//
 ////            //根据arrangementList查询出排班的id
 ////            List<Long> scheduleIdList = arrangementList.stream().map(AttendanceArrangement::getId).toList();
 ////            //根据排班的id查询出排班的人员详细信息
@@ -407,7 +394,6 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
 //            count++;
 //        }
         return TableDataInfo.build(result);
-
     }
 
 
@@ -511,6 +497,10 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
      */
     private void validEntityBeforeSave(AttendanceArrangement entity) {
         //TODO 做一些数据校验,如唯一约束
+        //新增时判断在该时间段内是否有排班
+
+
+
     }
 
     /**