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 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 @@ - org.springframework.boot