Merge branch 'zx_saas_courseware' of http://git.dayaedu.com/yonge/mec into zx_saas_homework

mec-application/src/main/java/com/ym/mec/web/controller/LessonCoursewareController.java

@@ -47,7 +47,7 @@ public class LessonCoursewareController extends BaseController {
 	@PostMapping("/queryLessonCoursewareId")
 	@PreAuthorize("@pcs.hasPermissions('lessonCourseware/queryLessonCoursewareId')")
 	public HttpResponseResult<List<Long>> queryLessonCoursewareId(){
-		List<LessonCourseware> list = lessonCoursewareService.lambdaQuery().list();
+		List<LessonCourseware> list = lessonCoursewareService.list();
 		if (list == null || list.isEmpty()) {
 			return succeed(Lists.newArrayList());
 		}

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/LessonCoursewareMapper.java

@@ -15,7 +15,7 @@ public interface LessonCoursewareMapper extends BaseMapper<LessonCourseware> {
     List<LessonCoursewareWrapper.LessonCoursewareDto> selectPage(@Param("page") IPage<LessonCoursewareWrapper.LessonCoursewareDto> page,
                                                                  @Param("param") LessonCoursewareWrapper.LessonCoursewareQuery param);
 
-    List<LessonCoursewareWrapper.LessonCoursewareDto> selectList(@Param("param") LessonCoursewareWrapper.LessonCoursewareQuery param);
+    List<LessonCoursewareWrapper.LessonCoursewareDto> list(@Param("param") LessonCoursewareWrapper.LessonCoursewareQuery param);
 
 
     //获取课件关联的声部列表

mec-biz/src/main/java/com/ym/mec/biz/service/impl/LessonCoursewareServiceImpl.java

@@ -52,7 +52,7 @@ public class LessonCoursewareServiceImpl extends ServiceImpl<LessonCoursewareMap
     @Override
     public IPage<LessonCoursewareWrapper.LessonCoursewareDto> selectPage(IPage<LessonCoursewareWrapper.LessonCoursewareDto> page, LessonCoursewareWrapper.LessonCoursewareQuery query) {
         if(StringUtils.isNotEmpty(query.getSearch())){
-            List<LessonCoursewareWrapper.LessonCoursewareDto> dtos = baseMapper.selectList(query);
+            List<LessonCoursewareWrapper.LessonCoursewareDto> dtos = baseMapper.list(query);
             if(CollectionUtils.isNotEmpty(dtos)){
                 List<Long> lessonCoursewareIds = dtos.stream().map(LessonCoursewareWrapper.LessonCoursewareDto::getLessonCoursewareId).collect(Collectors.toList());
                 CbsLessonCoursewareWrapper.LambdaQuery lambdaQuery = new CbsLessonCoursewareWrapper.LambdaQuery();

mec-biz/src/main/resources/config/mybatis/LessonCoursewareMapper.xml

@@ -26,7 +26,7 @@
                 and lc.teacher_range_type_ = #{param.teacherRangeType}
             </if>
             <if test="param.enable != null">
-                and lc.id_enable_ = #{param.enable}
+                and lc.enable_ = #{param.enable}
             </if>
         </where>
     </sql>
@@ -40,7 +40,7 @@
         GROUP BY lc.id_
         order by lc.create_time_ desc
 	</select>
-    <select id="selectList" resultType="com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper$LessonCoursewareDto">
+    <select id="list" resultType="com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper$LessonCoursewareDto">
         select lc.id_ id, lc.subject_id_ subjectId, lc.lesson_course_id_ lessonCoursewareId, lc.enable_ enable from lesson_courseware lc
         left join lesson_courseware_user_mapper lcum ON lcum.lesson_courseware_id_ = lc.id_
         <include refid="selectPageSql"/>