diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java index f1e7d791..6c9ee09a 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java +++ b/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; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/user/CacheUserUtil.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/user/CacheUserUtil.java index d277c5e2..e2ba8aeb 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/user/CacheUserUtil.java +++ b/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 diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java index ec5b9d21..a33df054 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionSnapshotService.java +++ b/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 CoreBaseServicequeryByCondition(PageQuery query){ PageQuery ret = resourcesQuestionSnapshotDao.queryByCondition(query); @@ -176,7 +176,7 @@ public class ResourcesQuestionSnapshotService extends CoreBaseService byIds = resourcesQuestionDao.getByIds(questionIdPlural); + List byIds = teacherOpenCourseMergeResourcesQuestionDao.getByIds(questionIdPlural); List snapshotList = BeanUtil.copyToList(byIds, ResourcesQuestionSnapshot.class); snapshotList.forEach(snapshot -> { snapshot.setTeacherOpenCourseQuestionSettingId(teacherOpenCourseQuestionSettingId); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java index 00e9f0e2..9ca57352 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java +++ b/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(), "非学生身份,无法获取题目!"); diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java index eb485c1f..dbcfd789 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesController.java +++ b/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) { + + } }