he2802 há 4 anos atrás
pai
commit
4d243464a9

+ 1 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorCategoryController.java

@@ -122,7 +122,7 @@ public class MajorCategoryController extends BaseController {
     /**
      * 删除【专业分类】
      */
-  /*  @ApiOperation("删除【专业分类】")
+    /*@ApiOperation("删除【专业分类】")
     @PreAuthorize("@ss.hasPermi('course:category:remove')")
     @Log(title = "【专业分类】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{categoryIds}")

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseChapterQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -47,6 +48,6 @@ public class CourseChapterQueryBo extends BaseEntity {
 	private Long sort;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 
 }

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -60,7 +61,7 @@ public class CourseQueryBo extends BaseEntity {
 	private String introduction;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 教师ID拼接,用,拼接 */
 	@ApiModelProperty("教师ID拼接,用,拼接")
 	private String teacherIds;

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -50,6 +51,6 @@ public class CourseSectionQueryBo extends BaseEntity {
 	private Long videoTime;
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 
 }

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorCategoryQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -44,7 +45,7 @@ public class MajorCategoryQueryBo extends BaseEntity {
 	private Integer sort;
 	/** 1正常 0关闭 */
 	@ApiModelProperty("1正常 0关闭")
-	private Integer status;
+	private List<Integer> status;
 	/** 分类名称 */
 	@ApiModelProperty("分类名称")
 	private String categoryName;

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/TeacherQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -47,6 +48,6 @@ public class TeacherQueryBo extends BaseEntity {
 	private String avatar;
 	/** 状态 0关闭 1开启 */
 	@ApiModelProperty("状态 0关闭 1开启")
-	private Integer status;
+	private List<Integer> status;
 
 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterServiceImpl.java

@@ -42,7 +42,7 @@ public class CourseChapterServiceImpl extends ServiceImpl<CourseChapterMapper, C
         lqw.eq(bo.getCourseId() != null, CourseChapter::getCourseId, bo.getCourseId());
         lqw.like(StrUtil.isNotBlank(bo.getName()), CourseChapter::getName, bo.getName());
         lqw.eq(bo.getSort() != null, CourseChapter::getSort, bo.getSort());
-        lqw.eq(bo.getStatus() != null, CourseChapter::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, CourseChapter::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionServiceImpl.java

@@ -42,7 +42,7 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
         lqw.like(StrUtil.isNotBlank(bo.getName()), CourseSection::getName, bo.getName());
         lqw.eq(StrUtil.isNotBlank(bo.getVideoUrl()), CourseSection::getVideoUrl, bo.getVideoUrl());
         lqw.eq(bo.getVideoTime() != null, CourseSection::getVideoTime, bo.getVideoTime());
-        lqw.eq(bo.getStatus() != null, CourseSection::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, CourseSection::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -47,7 +47,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
         lqw.eq(bo.getEndTime() != null, Course::getEndTime, bo.getEndTime());
         lqw.eq(StrUtil.isNotBlank(bo.getCoverUrl()), Course::getCoverUrl, bo.getCoverUrl());
         lqw.eq(StrUtil.isNotBlank(bo.getIntroduction()), Course::getIntroduction, bo.getIntroduction());
-        lqw.eq(bo.getStatus() != null, Course::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, Course::getStatus, bo.getStatus());
         lqw.eq(StrUtil.isNotBlank(bo.getTeacherIds()), Course::getTeacherIds, bo.getTeacherIds());
         lqw.like(StrUtil.isNotBlank(bo.getCourseName()), Course::getCourseName, bo.getCourseName());
         return entity2Vo(this.list(lqw));

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorCategoryServiceImpl.java

@@ -45,7 +45,7 @@ public class MajorCategoryServiceImpl extends ServiceImpl<MajorCategoryMapper, M
         LambdaQueryWrapper<MajorCategory> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getPId() != null, MajorCategory::getPId, bo.getPId());
         lqw.eq(bo.getSort() != null, MajorCategory::getSort, bo.getSort());
-        lqw.eq(bo.getStatus() != null, MajorCategory::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, MajorCategory::getStatus, bo.getStatus());
         lqw.like(StrUtil.isNotBlank(bo.getCategoryName()), MajorCategory::getCategoryName, bo.getCategoryName());
         return entity2Vo(this.list(lqw));
     }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/TeacherServiceImpl.java

@@ -41,7 +41,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> impl
     public List<TeacherVo> queryList(TeacherQueryBo bo) {
         LambdaQueryWrapper<Teacher> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getTeacherName()), Teacher::getTeacherName, bo.getTeacherName());
-        lqw.eq(bo.getStatus() != null, Teacher::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, Teacher::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamArrangementQueryBo.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -81,7 +82,7 @@ public class ExamArrangementQueryBo extends BaseEntity {
 	private String examPeriod;
 	/** 0删除 1待发布 2 撤回 3发布成功 */
 	@ApiModelProperty("0删除 1待发布 2 撤回 3发布成功")
-	private Integer status;
+	private List<Integer> status;
 	/** 0 笔试  1机考 */
 	@ApiModelProperty("0 笔试  1机考")
 	private Integer examForm;