Commit c927c282 authored by root's avatar root

修改首页接口

parent 4b639c49
...@@ -21,7 +21,7 @@ public interface BLessonPersonRepository extends BaseMapper<BLabel> { ...@@ -21,7 +21,7 @@ public interface BLessonPersonRepository extends BaseMapper<BLabel> {
" from b_lesson_person blp " + " from b_lesson_person blp " +
" left join b_lesson bl on blp.lesson_id = bl.business_id " + " left join b_lesson bl on blp.lesson_id = bl.business_id " +
" left join s_user su on su.business_id = bl.lecturer_id " + " left join s_user su on su.business_id = bl.lecturer_id " +
" left join b_course bc on bc.business_id = bl.course_type " + " left join b_course bc on bc.business_id = bl.course_id " +
" where blp.del_flag != 1 and blp.flag = 1 " + " where blp.del_flag != 1 and blp.flag = 1 " +
" and bl.del_flag != 1 and bl.flag = 1 " + " and bl.del_flag != 1 and bl.flag = 1 " +
" and su.del_flag != 1 and su.flag = 1 " + " and su.del_flag != 1 and su.flag = 1 " +
......
...@@ -81,7 +81,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -81,7 +81,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" from b_lesson bl " + " from b_lesson bl " +
" left join s_user su on su.business_id = bl.lecturer_id " + " left join s_user su on su.business_id = bl.lecturer_id " +
" left join s_user suc on suc.business_id = bl.create_by " + " left join s_user suc on suc.business_id = bl.create_by " +
" left join b_course bc on bc.business_id = bl.course_type " + " left join b_course bc on bc.business_id = bl.course_id " +
" where bl.del_flag != 1 and bl.flag = 1 " + " where bl.del_flag != 1 and bl.flag = 1 " +
" and su.del_flag != 1 and su.flag = 1 " + " and su.del_flag != 1 and su.flag = 1 " +
" and suc.del_flag != 1 and suc.flag = 1 " + " and suc.del_flag != 1 and suc.flag = 1 " +
...@@ -110,7 +110,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -110,7 +110,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" <if test= \" lessonName != null and lessonName != ''\">and bl.lesson_name like CONCAT('%',#{lessonName},'%') </if> " + " <if test= \" lessonName != null and lessonName != ''\">and bl.lesson_name like CONCAT('%',#{lessonName},'%') </if> " +
" <if test= \" releaseState !=null and releaseState != ''\">and bl.release_state = #{releaseState} </if> " + " <if test= \" releaseState !=null and releaseState != ''\">and bl.release_state = #{releaseState} </if> " +
" <if test= \" createByName != null and createByName != ''\">and suc.name like CONCAT('%',#{createByName},'%') </if> " + " <if test= \" createByName != null and createByName != ''\">and suc.name like CONCAT('%',#{createByName},'%') </if> " +
" <if test= \" courseType !=null and courseType != ''\">and bl.course_type = #{courseType} </if> " + " <if test= \" courseId !=null and courseId != ''\">and bl.course_id = #{courseId} </if> " +
" <if test= \" viewRange !=null and viewRange != ''\">and bl.view_range = #{viewRange} </if> " + " <if test= \" viewRange !=null and viewRange != ''\">and bl.view_range = #{viewRange} </if> " +
" <if test= \" lessonType !=null and lessonType != ''\">and bl.lesson_type = #{lessonType} </if> " + " <if test= \" lessonType !=null and lessonType != ''\">and bl.lesson_type = #{lessonType} </if> " +
" <if test= \" recommend !=null and recommend != ''\">and bl.recommend = #{recommend} </if> " + " <if test= \" recommend !=null and recommend != ''\">and bl.recommend = #{recommend} </if> " +
...@@ -133,7 +133,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -133,7 +133,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" left join s_user suc on suc.business_id = bl.create_by " + " left join s_user suc on suc.business_id = bl.create_by " +
" left join b_viewrange bv on bl.business_id = bv.lesson_id " + " left join b_viewrange bv on bl.business_id = bv.lesson_id " +
" left join b_viewrange_son bvs on bv.business_id = bvs.viewrange_id " + " left join b_viewrange_son bvs on bv.business_id = bvs.viewrange_id " +
// " left join b_course bc on bc.business_id = bl.course_type " + // " left join b_course bc on bc.business_id = bl.course_id " +
" where bl.del_flag != 1 and bl.flag = 1 " + " where bl.del_flag != 1 and bl.flag = 1 " +
" and su.del_flag != 1 and su.flag = 1 " + " and su.del_flag != 1 and su.flag = 1 " +
" and suc.del_flag != 1 and suc.flag = 1 " + " and suc.del_flag != 1 and suc.flag = 1 " +
...@@ -175,7 +175,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -175,7 +175,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" left join s_user suc on suc.business_id = bl.create_by " + " left join s_user suc on suc.business_id = bl.create_by " +
" left join b_recommend br on bl.business_id = br.lesson_id " + " left join b_recommend br on bl.business_id = br.lesson_id " +
" left join b_recommend_son brs on br.business_id = brs.recommend_id " + " left join b_recommend_son brs on br.business_id = brs.recommend_id " +
// " left join b_course bc on bc.business_id = bl.course_type " + // " left join b_course bc on bc.business_id = bl.course_id " +
" where bl.del_flag != 1 and bl.flag = 1 " + " where bl.del_flag != 1 and bl.flag = 1 " +
" and su.del_flag != 1 and su.flag = 1 " + " and su.del_flag != 1 and su.flag = 1 " +
" and suc.del_flag != 1 and suc.flag = 1 " + " and suc.del_flag != 1 and suc.flag = 1 " +
...@@ -203,7 +203,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -203,7 +203,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
// //" and su.COP == " //企业id // //" and su.COP == " //企业id
// //
// " left join s_user suc on suc.business_id = bl.create_by " + // " left join s_user suc on suc.business_id = bl.create_by " +
//// " left join b_course bc on bc.business_id = bl.course_type " + //// " left join b_course bc on bc.business_id = bl.course_id " +
// " where bl.del_flag != 1 and bl.flag = 1 " + // " where bl.del_flag != 1 and bl.flag = 1 " +
// //
// //" and COP == " //企业id // //" and COP == " //企业id
...@@ -221,7 +221,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -221,7 +221,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" left join s_user suc on suc.business_id = bl.create_by " + " left join s_user suc on suc.business_id = bl.create_by " +
" left join b_viewrange bv on bl.business_id = bv.lesson_id " + " left join b_viewrange bv on bl.business_id = bv.lesson_id " +
" left join b_viewrange_son bvs on bv.business_id = bvs.viewrange_id " + " left join b_viewrange_son bvs on bv.business_id = bvs.viewrange_id " +
// " left join b_course bc on bc.business_id = bl.course_type " + // " left join b_course bc on bc.business_id = bl.course_id " +
" where bl.del_flag != 1 and bl.flag = 1 " + " where bl.del_flag != 1 and bl.flag = 1 " +
" and su.del_flag != 1 and su.flag = 1 " + " and su.del_flag != 1 and su.flag = 1 " +
" and suc.del_flag != 1 and suc.flag = 1 " + " and suc.del_flag != 1 and suc.flag = 1 " +
...@@ -242,7 +242,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -242,7 +242,7 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
// " from b_lesson bl " + // " from b_lesson bl " +
// " left join s_user su on su.business_id = bl.lecturer_id " + // " left join s_user su on su.business_id = bl.lecturer_id " +
// " left join s_user suc on suc.business_id = bl.create_by " + // " left join s_user suc on suc.business_id = bl.create_by " +
//// " left join b_course bc on bc.business_id = bl.course_type " + //// " left join b_course bc on bc.business_id = bl.course_id " +
// " where bl.del_flag != 1 and bl.flag = 1 " + // " where bl.del_flag != 1 and bl.flag = 1 " +
// " and su.del_flag != 1 and su.flag = 1 " + // " and su.del_flag != 1 and su.flag = 1 " +
// " and suc.del_flag != 1 and suc.flag = 1 " + // " and suc.del_flag != 1 and suc.flag = 1 " +
...@@ -308,14 +308,14 @@ public interface BLessonRepository extends BaseMapper<BLesson> { ...@@ -308,14 +308,14 @@ public interface BLessonRepository extends BaseMapper<BLesson> {
" from b_lesson bl " + " from b_lesson bl " +
" left join s_user su on su.business_id = bl.lecturer_id " + " left join s_user su on su.business_id = bl.lecturer_id " +
" left join s_user suc on suc.business_id = bl.create_by " + " left join s_user suc on suc.business_id = bl.create_by " +
// " left join b_course bc on bc.business_id = bl.course_type " + // " left join b_course bc on bc.business_id = bl.course_id " +
" where bl.del_flag != 1 and bl.flag = 1 " + " where bl.del_flag != 1 and bl.flag = 1 " +
" and su.del_flag != 1 and su.flag = 1 " + " and su.del_flag != 1 and su.flag = 1 " +
" and suc.del_flag != 1 and suc.flag = 1 " + " and suc.del_flag != 1 and suc.flag = 1 " +
" and bl.release_state = 2 " + " and bl.release_state = 2 " +
" <if test= \" param.viewParam !=null and param.viewParam != ''\">and (bl.lesson_name like CONCAT('%',#{param.viewParam},'%') " + " <if test= \" param.viewParam !=null and param.viewParam != ''\">and (bl.lesson_name like CONCAT('%',#{param.viewParam},'%') " +
" or su.name like CONCAT('%',#{param.viewParam},'%'))</if> " + " or su.name like CONCAT('%',#{param.viewParam},'%'))</if> " +
" <if test= \" courseIds !=null and courseIds.size() > 0 \">and course_type in " + " <if test= \" courseIds !=null and courseIds.size() > 0 \">and course_id in " +
" <foreach item='item' index='index' collection='courseIds' open='(' separator=',' close=')'> #{item} </foreach> " + " <foreach item='item' index='index' collection='courseIds' open='(' separator=',' close=')'> #{item} </foreach> " +
" </if> " + " </if> " +
" order by bl.person_number desc " + " order by bl.person_number desc " +
......
...@@ -28,7 +28,7 @@ public class AddLessonDTO { ...@@ -28,7 +28,7 @@ public class AddLessonDTO {
@ApiModelProperty(value = "课程分类",required = true) @ApiModelProperty(value = "课程分类",required = true)
@NotBlank @NotBlank
@Length(min = 1,max = 64,message = "长度最小为1,最大为50") @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
private String courseType; private String courseId;
@ApiModelProperty(value = "课程描述") @ApiModelProperty(value = "课程描述")
......
...@@ -21,7 +21,7 @@ public class FindAllLessonDTO { ...@@ -21,7 +21,7 @@ public class FindAllLessonDTO {
@ApiModelProperty(value = "课程分类") @ApiModelProperty(value = "课程分类")
@Length(min = 1,max = 64,message = "长度最小为1,最大为50") @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
private String courseType; private String courseId;
@ApiModelProperty(value = "可见范围") @ApiModelProperty(value = "可见范围")
@Length(min = 1,max = 64,message = "长度最小为1,最大为50") @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
......
...@@ -52,7 +52,7 @@ public class BLesson extends IdEntity<BLesson> { ...@@ -52,7 +52,7 @@ public class BLesson extends IdEntity<BLesson> {
@ApiModelProperty(value = "课程分类") @ApiModelProperty(value = "课程分类")
@Length(min = 1,max = 64,message = "长度最小为1,最大为50") @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
private String courseType; private String courseId;
@ApiModelProperty(value = "选课人数") @ApiModelProperty(value = "选课人数")
@Length(min = 1,max = 64,message = "长度最小为1,最大为50") @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
......
...@@ -76,7 +76,7 @@ public class BLessonPerson extends IdEntity<BLessonPerson> { ...@@ -76,7 +76,7 @@ public class BLessonPerson extends IdEntity<BLessonPerson> {
@ApiModelProperty(value = "分类") @ApiModelProperty(value = "分类")
@Transient @Transient
private String courseType; private String courseId;
@ApiModelProperty(value = "评论数") @ApiModelProperty(value = "评论数")
@Transient @Transient
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<result column="class_hour" jdbcType="VARCHAR" property="classHour"/> <result column="class_hour" jdbcType="VARCHAR" property="classHour"/>
<result column="lecturer_id" jdbcType="VARCHAR" property="lecturerId"/> <result column="lecturer_id" jdbcType="VARCHAR" property="lecturerId"/>
<result column="release_state" jdbcType="VARCHAR" property="releaseState"/> <result column="release_state" jdbcType="VARCHAR" property="releaseState"/>
<result column="course_type" jdbcType="VARCHAR" property="courseType"/> <result column="course_id" jdbcType="VARCHAR" property="courseId"/>
<result column="person_number" jdbcType="VARCHAR" property="personNumber"/> <result column="person_number" jdbcType="VARCHAR" property="personNumber"/>
<result column="course_time" jdbcType="VARCHAR" property="courseTime"/> <result column="course_time" jdbcType="VARCHAR" property="courseTime"/>
<result column="course_description" jdbcType="VARCHAR" property="courseDescription"/> <result column="course_description" jdbcType="VARCHAR" property="courseDescription"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment