导入课程下拉框，判断时间

admin-console/src/main/java/com/ibeetl/admin/console/service/OrgConsoleService.java

@@ -1,5 +1,6 @@
 package com.ibeetl.admin.console.service;
 
+import cn.hutool.core.util.ReflectUtil;
 import com.ibeetl.admin.console.dao.OrgConsoleDao;
 import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.entity.CoreUser;
@@ -14,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * 
@@ -89,5 +91,15 @@ public class OrgConsoleService extends CoreBaseService<CoreOrg> {
     }
     
 
+    public static <T> void setObjectOrgId(T obj, Function<T, Long> function) {
+        Long orgId = function.apply(obj);
+        ReflectUtil.setFieldValue(obj, "orgId", orgId);
+    }
 
+    public static <T> void setObjectOrgId(List<T> obj, Function<T, Long> function, boolean is) {
+        for (T t : obj) {
+            Long orgId = function.apply(t);
+            ReflectUtil.setFieldValue(obj, "orgId", orgId);
+        }
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java

@@ -2,7 +2,6 @@ package com.ibeetl.jlw.web;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import cn.jlw.Interceptor.SCoreUser;
@@ -14,8 +13,8 @@ import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.file.FileService;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.service.CoreUserService;
-import com.ibeetl.admin.core.util.BeanUtil;
 import com.ibeetl.admin.core.web.JsonResult;
+import com.ibeetl.jlw.dao.UniversitiesCollegesDao;
 import com.ibeetl.jlw.entity.SchoolClass;
 import com.ibeetl.jlw.entity.UniversitiesColleges;
 import com.ibeetl.jlw.entity.UniversitySystem;
@@ -45,6 +44,7 @@ import java.util.stream.Collectors;
 
 import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static cn.jlw.util.CacheUserUtil.getStudent;
+import static com.ibeetl.admin.console.service.OrgConsoleService.setObjectOrgId;
 import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
 
 /**
@@ -63,6 +63,7 @@ public class SchoolClassController extends BaseController {
     @Autowired private SchoolClassService schoolClassService;
 
     @Autowired private UniversitiesCollegesService universitiesCollegesService;
+    @Autowired private UniversitiesCollegesDao universitiesCollegesDao;
 
     @Autowired private UniversitySystemService systemService;
     @Autowired private CorePlatformService corePlatformService;
@@ -316,8 +317,16 @@ public class SchoolClassController extends BaseController {
                 .map(SchoolClassBatchImportDTO::pojo)
                 .collect(Collectors.toList());
 
-        // 只复制用户ID和组织ID
-        BeanUtil.beanPropertyCopyToList(coreUser, classList, MapUtil.of("id", "userId"), "userId", "orgId");
+        // 设置机构ID
+        setObjectOrgId(classList, (e) -> {
+            UniversitiesColleges universitiesColleges = new UniversitiesColleges();
+            universitiesColleges.setUniversitiesCollegesId(e.getUniversitiesCollegesId());
+            UniversitiesColleges uc = universitiesCollegesDao.templateOne(universitiesColleges);
+            if (uc != null) {
+                return uc.getOrgId();
+            }
+            return null;
+        }, true);
 
         try {
             schoolClassService.validateClassSnListIsExistsThrow(classList);

web/src/main/resources/sql/jlw/teacherOpenCourseMergeScheduleSession.md

@@ -88,7 +88,7 @@ queryByConditionQuery
   @if(!isEmpty(userIdPlural)){
   and find_in_set(t.user_id,#userIdPlural#)
   @}
-
+  order by t.teacher_open_course_merge_schedule_session_add_time desc
 
 
 

web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md

@@ -539,9 +539,11 @@ getSessionNameList
     1 = 1
     AND t.teacher_open_course_schedule_session_status = 1
     AND ta.teacher_open_course_status = 1
+    @// 当前时间，小于怕排课的结束时间。才能导入
+    AND now() < teacher_open_course_schedule_session_end_date
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
   @}
   @if(!isEmpty(teacherId)){
   and t.teacher_id =#teacherId#
-  @}
+  @}