Merge branch 'master' of git.dayaedu.com:yonge/cooleshow

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/entity/SysUser.java

@@ -50,7 +50,7 @@ public class SysUser implements Serializable{
 	private java.util.Date updateTime;
 
 	/** 0-正常，9-锁定 */
-	@ApiModelProperty(value = "0-正常，9-锁定")
+	@ApiModelProperty(value = "0-正常，1-锁定")
 	private Integer lockFlag;
 
 	/** 0-正常，1-删除 */

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -300,11 +300,11 @@ public class UserController extends BaseController {
     @GetMapping(value = "/changeLock/{userId}/{lockFlag}")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "userId", paramType = "path", dataType = "long", required = true),
-            @ApiImplicitParam(name = "lockFlag", value = "锁定状态 0-正常，9-锁定", paramType = "path", dataType = "int", required = true)
+            @ApiImplicitParam(name = "lockFlag", value = "锁定状态 0-正常，1-锁定", paramType = "path", dataType = "int", required = true)
     })
     @ApiOperation(value = "启用/冻结", notes = "传入lockFlag")
     public HttpResponseResult<Boolean> changeLock(@PathVariable("userId") Long userId, @PathVariable("lockFlag") Integer lockFlag) {
-        if (userId == null && lockFlag != 0 && lockFlag != 9) {
+        if (userId == null && lockFlag != 0 && lockFlag != 1) {
             return failed("参数校验异常");
         }
         SysUser sysUser = sysUserService.queryUserInfo(userId);

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/MusicTheoryController.java

@@ -119,6 +119,7 @@ public class MusicTheoryController {
     @ApiOperation(value = "app乐理知识")
     public HttpResponseResult<PageInfo<SysNewsTypeDto>> appPage(@RequestBody QueryInfo query) {
 
+        query.setRows(200);
         return succeed(newsTypeService.appPage(query));
     }
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsTypeDao.java

@@ -14,4 +14,6 @@ public interface SysNewsTypeDao extends BaseDAO<Long, SysNewsType> {
 	List<SysNewsTypeTree> queryByParentId(Long parentId);
 
     List<SysNewsTypeDto> queryAppPage(Map<String, Object> params);
+
+	int queryAppCount(Map<String, Object> params);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsTypeServiceImpl.java

@@ -60,7 +60,7 @@ public class SysNewsTypeServiceImpl extends BaseServiceImpl<Long, SysNewsType> i
 		MapUtil.populateMap(params, query);
 
 		List<SysNewsTypeDto> dataList = null;
-		int count = sysNewsTypeDao.queryCount(params);
+		int count = sysNewsTypeDao.queryAppCount(params);
 		if (count > 0) {
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());

cooleshow-cms/src/main/resources/config/mybatis/SysNewsTypeMapper.xml

@@ -113,6 +113,9 @@
 		FROM sys_news_type snt
 		left join sys_news_information sni on sni.sub_type_ = snt.id_
 		where snt.del_flag_ = 0 and snt.parent_id_ = 6 and sni.del_flag_ = 0 and sni.status_ = 1
+		<if test="search != null and search != ''">
+			and  (sni.title_ like concat('%',#{search},'%') or snt.name_ like concat('%',#{search},'%'))
+		</if>
 		ORDER BY snt.order_ , sni.order_
 		<include refid="global.limit" />
 	</select>
@@ -152,4 +155,16 @@
 			<result column="create_by_" property="createBy" />
 		</collection>
 	</resultMap>
+
+	<select id="queryAppCount" resultType="int">
+		SELECT count(1)
+		FROM sys_news_type snt
+		left join sys_news_information sni on sni.sub_type_ = snt.id_
+		where snt.del_flag_ = 0 and snt.parent_id_ = 6 and sni.del_flag_ = 0 and sni.status_ = 1
+		<if test="search != null and search != ''">
+			and  (sni.title_ like concat('%',#{search},'%') or snt.name_ like concat('%',#{search},'%'))
+		</if>
+		ORDER BY snt.order_ , sni.order_
+		<include refid="global.limit" />
+	</select>
 </mapper>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/VideoLessonGroupSearch.java

@@ -27,6 +27,9 @@ public class VideoLessonGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "老师id")
     private Long teacherId;
 
+    @ApiModelProperty(value = "声部id")
+    private Long lessonSubject;
+
     @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
     private YesOrNoEnum auditVersion;
 
@@ -36,6 +39,14 @@ public class VideoLessonGroupSearch extends QueryInfo {
     @ApiModelProperty(value = "平台",required = true)
     private String platform;
 
+    public Long getLessonSubject() {
+        return lessonSubject;
+    }
+
+    public void setLessonSubject(Long lessonSubject) {
+        this.lessonSubject = lessonSubject;
+    }
+
     public YesOrNoEnum getAuditVersion() {
         return auditVersion;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -110,6 +110,9 @@
 			<if test="param.teacherId !=null">
 				AND g.teacher_id_ = #{param.teacherId}
 			</if>
+			<if	test="param.lessonSubject != null">
+				AND g.lesson_subject_ = #{param.lessonSubject}
+			</if>
 		</where>
 	</select>
 	<select id="selectStudentPage" resultType="com.yonge.cooleshow.biz.dal.vo.VideoLessonStudentDetailVo">