diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java index 34b82d58..96a1b047 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestionSnapshot.java @@ -77,7 +77,7 @@ public class ResourcesQuestionSnapshot extends BaseEntity { private String questionAnalysis ; - //题目状态 (1上架, 2下架) + //题目状态 (1上架, 2下架,0删除) @Dict(type="up_status") private Integer questionStatus ; diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java index b2073532..e9b1c1a4 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java @@ -112,7 +112,7 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity { private String questionAnalysis ; - //题目状态 (1上架, 2下架) + //题目状态 (1上架, 2下架,0删除) @Dict(type="up_status") private Integer questionStatus ; diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java index d6563e24..8e32d781 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java @@ -816,6 +816,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService resourcesQuestionSnapshotList = resourcesQuestionSnapshotDao.getValuesByQueryNotWithPermission(questionSnapshotQuery); resourcesQuestionSnapshotList = ObjectUtil.defaultIfNull(resourcesQuestionSnapshotList, new ArrayList<>()); diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java index 899684fd..8050c6e6 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java @@ -85,6 +85,9 @@ public class ResourcesQuestionSnapshotController extends BaseController { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ + if (param.getQuestionStatus()==null) { + param.setQuestionStatus(1); + } Listlist = resourcesQuestionSnapshotService.getValuesByQuery(param); return JsonResult.success(list); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java index 2085e7ef..94b002b2 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java @@ -45,7 +45,7 @@ public class ResourcesQuestionSnapshotQuery extends PageParam { private String questionAnswer; @Query(name = "解析", display = false) private String questionAnalysis; - @Query(name = "题目状态 (1上架, 2下架)", display = true,type=Query.TYPE_DICT,dict="up_status") + @Query(name = "题目状态 (1上架, 2下架,0删除)", display = true,type=Query.TYPE_DICT,dict="up_status") private Integer questionStatus; @Query(name = "后台用户ID", display = false) private Long userId; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesQuestionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesQuestionQuery.java index a56f812f..9aa168ef 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesQuestionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesQuestionQuery.java @@ -42,7 +42,7 @@ public class TeacherOpenCourseMergeResourcesQuestionQuery extends PageParam { private String questionAnswer; @Query(name = "解析", display = false) private String questionAnalysis; - @Query(name = "题目状态 (1上架, 2下架)", display = true,type=Query.TYPE_DICT,dict="up_status") + @Query(name = "题目状态 (1上架, 2下架,0删除)", display = true,type=Query.TYPE_DICT,dict="up_status") private Integer questionStatus; @Query(name = "后台用户ID", display = false) private Long userId;