课表导入

slive/src/main/java/com/xhkjedu/slive/utils/PoiUtils.java

@@ -178,8 +178,11 @@ public class PoiUtils {
             String fileName = file.getOriginalFilename();
             Workbook work = getWorkbook(in, fileName);
             List<LCourse> kjTeas = new ArrayList<>();//行政直播课课节下班级和教师
+            Integer timestamp = N_Utils.getSecondTimestamp();
             //要删除的行政直播id
-            List<Integer> delCourseIds = kjs.stream().filter(c -> c.getCourseid() != null && c.getSectionstate() == 0)
+            List<Integer> delCourseIds = kjs.stream().filter(c -> c.getCourseid() != null && c.getSectionstate() == 0
+                            && new Integer(N_Utils.getDataToTimestamp(c.getSectiondate() + c.getBegintime()
+                            , "yyyy-MM-ddHH:mm")).compareTo(timestamp) == 1)
                     .map(XzKjVo::getCourseid).collect(Collectors.toList());
             Sheet sheet;// 分表数据
             Row row;// 行数据
@@ -245,7 +248,9 @@ public class PoiUtils {
                             kj = kjs.stream().filter(k -> k.getKjorder() == kjorder
                                     && sectiondate.equals(k.getSectiondate())).findFirst().orElse(null);
                             Integer sectionstate = kj == null ? null : kj.getSectionstate();
-                            if (sectionstate == null || sectionstate == 0) {//已经开始或结束的课不处理
+                            String begintime = sectiondate + " " + t.getBegintime();
+                            Integer beginTimestamp = N_Utils.getDataToTimestamp(begintime, "yyyy-MM-dd HH:mm");
+                            if (beginTimestamp.compareTo(timestamp) == 1 && (sectionstate == null || sectionstate == 0)) {//已经开始或结束的课不处理
                                 t.setBegindate(sectiondate);
                                 t.setEnddate(sectiondate);
                                 kjTeas.add(t);
@@ -253,9 +258,8 @@ public class PoiUtils {
                             List<String> meetDates = LiveUtil.getDaysForMeetDates(sectiondate, enddate);
                             for (int m = 1; m < meetDates.size(); m++) {
                                 String date = meetDates.get(m);
-                                String begintime = date + " " + t.getBegintime();
-                                Integer beginTimestamp = N_Utils.getDataToTimestamp(begintime, "yyyy-MM-dd HH:mm");
-                                Integer timestamp = N_Utils.getSecondTimestamp();
+                                begintime = date + " " + t.getBegintime();
+                                beginTimestamp = N_Utils.getDataToTimestamp(begintime, "yyyy-MM-dd HH:mm");
                                 if (beginTimestamp.compareTo(timestamp) != 1) continue;//如果课节开始时间不大于当前时间不处理
 
                                 LCourse t2 = new LCourse();