从离线的开课题目库添加考试作业等

admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java

@@ -21,7 +21,7 @@ public class CoreUser extends BaseEntity  {
 
 
 
-	@NotNull(message = "ID不能为空", groups =ValidateConfig. UPDATE.class)
+	@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
 	// @SeqID(name = ORACLE_CORE_SEQ_NAME)
 	@AutoID
 	protected Long id;

admin-core/src/main/java/com/ibeetl/admin/core/util/user/CacheUserUtil.java

@@ -45,6 +45,16 @@ public final class CacheUserUtil {
         }
     }
 
+    /**
+     * 获取当前的部门信息
+     * @return
+     */
+    public static CoreOrg getCurrentOrg() {
+        checkSession();
+        CoreOrg org = (CoreOrg) getRequest().getSession().getAttribute(ACCESS_CURRENT_ORG);
+        return org;
+    }
+
     /**
      * 获取当前登录用户的用户名
      * @return

web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java

@@ -8,9 +8,9 @@ import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
-import com.ibeetl.jlw.dao.ResourcesQuestionDao;
 import com.ibeetl.jlw.dao.ResourcesQuestionSnapshotDao;
 import com.ibeetl.jlw.dao.StudentDao;
+import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.web.query.ResourcesQuestionSnapshotQuery;
 import org.apache.commons.lang3.StringUtils;
@@ -46,7 +46,7 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
 
     @Autowired private ResourcesQuestionSnapshotDao resourcesQuestionSnapshotDao;
     @Autowired private StudentDao studentDao;
-    @Autowired private ResourcesQuestionDao resourcesQuestionDao;
+    @Autowired private TeacherOpenCourseMergeResourcesQuestionDao teacherOpenCourseMergeResourcesQuestionDao;
 
     public PageQuery<ResourcesQuestionSnapshot>queryByCondition(PageQuery query){
         PageQuery ret =  resourcesQuestionSnapshotDao.queryByCondition(query);
@@ -176,7 +176,7 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService<ResourcesQ
                 .collect(Collectors.joining(","));
 
         // 批量插入快照表
-        List<ResourcesQuestion> byIds = resourcesQuestionDao.getByIds(questionIdPlural);
+        List<TeacherOpenCourseMergeResourcesQuestion> byIds = teacherOpenCourseMergeResourcesQuestionDao.getByIds(questionIdPlural);
         List<ResourcesQuestionSnapshot> snapshotList = BeanUtil.copyToList(byIds, ResourcesQuestionSnapshot.class);
         snapshotList.forEach(snapshot -> {
             snapshot.setTeacherOpenCourseQuestionSettingId(teacherOpenCourseQuestionSettingId);

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

@@ -93,7 +93,7 @@ public class TeacherOpenCourseQuestionLogController {
      * @param fromTypeEnum 来源类型
      * @return
      */
-    @PostMapping(API + "/questionDetail.json")
+    @PostMapping(API + "/questionDetail.do")
     public JsonResult questionDetail(Long teacherOpenCourseQuestionSettingId,
                                      ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum, @SCoreUser CoreUser coreUser) {
         Assert.isTrue(coreUser.isStudent(), "非学生身份，无法获取题目!");

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

@@ -233,4 +233,9 @@ public class UniversitiesCollegesController{
         }
     }
 
+    @PostMapping(MODEL + "/info.json")
+    @ResponseBody
+    public void info(UniversitiesCollegesQuery param, @SCoreUser CoreUser coreUser) {
+
+    }
 }