From 031a96ee923c384543ee07de6615d4df4963c67e Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 2 Nov 2022 18:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=A8=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ibeetl/admin/core/util/DateUtil.java  | 42 +++++++++----------
 ...acherOpenCourseScheduleSessionService.java | 10 ++---
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/DateUtil.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/DateUtil.java
index a6601614..945a43e1 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/util/DateUtil.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/DateUtil.java
@@ -1,12 +1,12 @@
 package com.ibeetl.admin.core.util;
 
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class DateUtil extends cn.hutool.core.date.DateUtil {
     
@@ -115,28 +115,28 @@ public class DateUtil extends cn.hutool.core.date.DateUtil {
 
     /**
      * 指定时间在时间列表中所在的第几周
-     * 根据天数来
+     * 根据周来
      *
-     * @param date
-     * @return
+     * @param startTime 开始时间
+     * @param date      比对时间
+     * @param weekNumber    周次
+     * @return  集合所在周次
      * @param <T>
      */
-    public static <T extends Date> Integer weekNumberInList(T startDate, T date, int weekNumber) {
-
-        AtomicInteger index = new AtomicInteger(0);
-
-//        int pageTotalNumber = dateTimeList.size() / pageSize;
-//
-//        // 分页
-//        List<T> list = ListUtil.page(1, pageSize, dateTimeList);
-//        page -> {
-//            for (int i = 0; i < page.size(); i++) {
-//                if(page.get(i).compareTo(date) == 0) {
-//                    index.set(i + 1);
-//                }
-//            }
-//        }); TODO malixiang 这里要写
-
-       return index.get();
+    public static <T extends Date> Integer weekNumberInList(T startTime, T date, int weekNumber) {
+
+        List<List<T>> lists = new ArrayList<>();
+        for (int i = 1; i <= weekNumber; i++) {
+            List<T> dateTimes = (List<T>) rangeToList(startTime, offsetWeek(startTime, i), DateField.DAY_OF_YEAR);
+            lists.add(dateTimes);
+        }
+
+        for (int i = 0; i < lists.size(); i++) {
+            if(((T)lists.get(i)).compareTo(date) == 0) {
+                return i;
+            }
+        }
+
+        return -1;
     }
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
index bc3c2524..683bbfa1 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
@@ -293,9 +293,6 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
         List<DateTime> dateTimes = insertByOptionResult.getDateTimes();
         Long teacherOpenCourseScheduleSessionId = insertByOptionResult.getTeacherOpenCourseScheduleSessionId();
 
-        DateTime startTime = parseDate(options.getStartTime());
-        DateTime endTime = DateUtil.offsetWeek(startTime, options.getWeekNum());
-
         // 断言，确保开课节次不为空
         Assert.notEmpty(options.getSessionClassList(), "开课节次不能为空！");
 
@@ -364,9 +361,10 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService<Tea
                     item.setTeacherOpenCourseScheduleSessionDayTime(dateTime.toString(NORM_DATE_PATTERN));
                     item.setTeacherOpenCourseId(options.getTeacherOpenCourseId());
                     // 根据具体周
-                    item.setTeacherOpenCourseScheduleSessionSnapCurrentWeekNumber(weekNumberInList(finalDateTimes, dateTime));
-                    // 根据天数来
-//                     item.setTeacherOpenCourseScheduleSessionSnapCurrentWeekNumber(weekNumberInList(finalDateTimes, dateTime, options.getWeekNum()));
+//                    item.setTeacherOpenCourseScheduleSessionSnapCurrentWeekNumber(weekNumberInList(finalDateTimes, dateTime));
+                    // 根据
+                    Integer currentWeekNumber = weekNumberInList(DateUtil.parseDateTime(options.getStartTime()), dateTime, options.getWeekNum());
+                    item.setTeacherOpenCourseScheduleSessionSnapCurrentWeekNumber(currentWeekNumber);
                 });
 
                 teacherOpenCourseScheduleSessionSnapDao.insertBatch(res);