新增固定班制主键重复修复

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java

@@ -50,6 +50,7 @@ public class AttendanceGroupBo extends BaseEntity {
 
 
     List<AttendanceScheduleCycle> numList;
+
     List<AttendanceWeekSet> weekSetList;
 
 

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java

@@ -174,7 +174,11 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
     @Override
     public List<AttendanceArrangementVo> queryList(AttendanceArrangementBo bo) {
 
-        //1.根据开始时间和结束时间查询所有的排班信息
+        //查看日历开始时间、结束时间和开始时间、结束时间的交集
+
+
+
+        //1.根据日历的开始时间和日历的结束时间查询所有的排班信息
         List<AttendanceArrangement> arrangementList = baseMapper.selectList(Wrappers.<AttendanceArrangement>lambdaQuery().ge(AttendanceArrangement::getStartDate, bo.getCalendarStartDate()).le(AttendanceArrangement::getEndDate, bo.getCalendarEndTimeDate()));
         //2.查询人员组的信息
         //根据开始时间查询排班的id

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java

@@ -203,11 +203,11 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
 
         //3.排班制
         if (Objects.equals(add.getAttendanceType(), StatusConstant.SHIFTSCHEDULE)) {
-            //2.2排班制，向天数表中插入数据
-            AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle();
             //循环向周期表中插入数据
             bo.getNumList().forEach(
                 num -> {
+                    //2.2排班制，向天数表中插入数据
+                    AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle();
                     attendanceScheduleCycle.setGroupId(add.getId());
                     attendanceScheduleCycle.setDayNumber(num.getDayNumber());
                     attendanceScheduleCycleMapper.insert(attendanceScheduleCycle);