From 829a9833c4d0b371aefdbcf531134032a38c06b1 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Fri, 7 Jul 2023 13:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xymanager_common/util/ScheduleListUtils.java  | 15 ++++++++-------
 xymanager_framework/pom.xml                       |  1 -
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java
index c196860..35c3782 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java
@@ -35,6 +35,14 @@ public class ScheduleListUtils {
         ArrayList<ScheduleDetails> list = new ArrayList<>();
         for (ScheduleRuleVo item : beans) {
 
+            Integer span = item.getSpan();
+            ScheduleDetails spanrule = new ScheduleDetails();
+            spanrule.setScheduleId(scheduleid);
+            spanrule.setHour(XyNumberUtils.delivery(span, 60));
+            spanrule.setMinute(XyNumberUtils.remainder(span, 60));
+            spanrule.setPreset(255);
+            list.add(spanrule);
+
             ScheduleDetails startrule = new ScheduleDetails();
             startrule.setScheduleId(scheduleid);
             Time startTime = item.getStartTime();
@@ -51,13 +59,6 @@ public class ScheduleListUtils {
             endrule.setPreset(255);
             list.add(endrule);
 
-            Integer span = item.getSpan();
-            ScheduleDetails spanrule = new ScheduleDetails();
-            spanrule.setScheduleId(scheduleid);
-            spanrule.setHour(XyNumberUtils.delivery(span, 60));
-            spanrule.setMinute(XyNumberUtils.remainder(span, 60));
-            spanrule.setPreset(255);
-            list.add(spanrule);
 
         }
         return list;
diff --git a/xymanager_framework/pom.xml b/xymanager_framework/pom.xml
index 0740a39..c1ea8ce 100644
--- a/xymanager_framework/pom.xml
+++ b/xymanager_framework/pom.xml
@@ -46,7 +46,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <!-- SpringBoot 拦截器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>