Merge branch 'dev' of https://github.com/roncoo/roncoo-education.git

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/controller/biz/BossCourseRecommendBiz.java

 package com.roncoo.education.course.service.controller.biz;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -11,8 +13,10 @@ import com.roncoo.education.course.service.dao.impl.mapper.entity.Course;
 import com.roncoo.education.course.service.dao.impl.mapper.entity.CourseRecommend;
 import com.roncoo.education.course.service.dao.impl.mapper.entity.CourseRecommendExample;
 import com.roncoo.education.course.service.dao.impl.mapper.entity.CourseRecommendExample.Criteria;
+import com.roncoo.education.util.base.BaseException;
 import com.roncoo.education.util.base.Page;
 import com.roncoo.education.util.base.PageUtil;
+import com.roncoo.education.util.enums.StatusIdEnum;
 import com.roncoo.education.util.tools.BeanUtil;
 import com.xiaoleilu.hutool.util.ObjectUtil;
 
@@ -36,7 +40,7 @@ public class BossCourseRecommendBiz {
 			c.andStatusIdEqualTo(qo.getStatusId());
 		}
 		c.andCategoryIdEqualTo(qo.getCategoryId());
-		example.setOrderByClause("sort desc, id desc");
+		example.setOrderByClause("status_id desc, sort desc, id desc");
 		Page<CourseRecommend> page = dao.listForPage(qo.getPageCurrent(), qo.getPageSize(), example);
 		Page<CourseRecommendVO> listForPage = PageUtil.transform(page, CourseRecommendVO.class);
 		for (CourseRecommendVO vo : listForPage.getList()) {
@@ -49,6 +53,10 @@ public class BossCourseRecommendBiz {
 	}
 
 	public int save(CourseRecommendQO qo) {
+		List<CourseRecommend> courseRecommend = dao.listByCategoryIdAndStatusId(qo.getCategoryId(), StatusIdEnum.YES.getCode());
+		if (courseRecommend.size() >= 5) {
+			throw new BaseException("课程只展示5个");
+		}
 		CourseRecommend record = BeanUtil.copyProperties(qo, CourseRecommend.class);
 		return dao.save(record);
 	}

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/dao/CourseRecommendDao.java

@@ -22,7 +22,7 @@ public interface CourseRecommendDao {
 	 * 
 	 * @param categoryId
 	 * @param StatusId
-	 * @return
+	 * @author kyh
 	 */
 	List<CourseRecommend> listByCategoryIdAndStatusId(Long categoryId, Integer StatusId);
 

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/controller/biz/BossLecturerAuditBiz.java

@@ -58,7 +58,6 @@ public class BossLecturerAuditBiz extends BaseBiz {
 	public Page<LecturerAuditVO> listForPage(LecturerAuditQO qo) {
 		LecturerAuditExample example = new LecturerAuditExample();
 		Criteria c = example.createCriteria();
-		c.andAuditStatusNotEqualTo(AuditStatusEnum.SUCCESS.getCode());
 		if (StringUtils.isNotEmpty(qo.getLecturerMobile())) {
 			c.andLecturerMobileEqualTo(qo.getLecturerMobile());
 		}
@@ -67,6 +66,8 @@ public class BossLecturerAuditBiz extends BaseBiz {
 		}
 		if (qo.getAuditStatus() != null) {
 			c.andAuditStatusEqualTo(qo.getAuditStatus());
+		}else {
+			c.andAuditStatusNotEqualTo(AuditStatusEnum.SUCCESS.getCode());
 		}
 		if (qo.getStatusId() != null) {
 			c.andStatusIdEqualTo(qo.getStatusId());

roncoo-education-web-boss/src/main/resources/templates/admin/sysRole/add.ftl

@@ -3,7 +3,7 @@
 	<form action="${base}/admin/sysRole/save" data-toggle="validate" method="post">
 		<div class="form-group">
             <label class="control-label x85">名称：</label>
-            <input type="text" name="roleName" value="" placeholder="名称" size="20" required="required">
+            <input type="text" name="roleName" value="" placeholder="名称" size="20" data-rule="required">
         </div>
         <div class="form-group">
             <label class="control-label x85">备注：</label>

roncoo-education-web-boss/src/main/resources/templates/admin/sysRole/edit.ftl

@@ -4,7 +4,7 @@
 		<input type="hidden" name="id" value="${bean.id}"/>
 		<div class="form-group">
             <label class="control-label x85">名称：</label>
-            <input type="text" name="roleName" value="${bean.roleName!}" placeholder="名称" size="20">
+            <input type="text" name="roleName" value="${bean.roleName!}" placeholder="名称" size="20" data-rule="required">
         </div>
         <div class="form-group">
             <label class="control-label x85">备注：</label>

roncoo-education-web-boss/src/main/resources/templates/course/adv/add.ftl

@@ -4,11 +4,11 @@
 	<input type="hidden" name="platShow" value="${bean.platShow}"/>
 		<div class="form-group">
 			<label class="control-label x85">广告图片：</label>
-			<input type="file" id="pictureFile" name="advFile" />
+			<input type="file" id="pictureFile" name="advFile" data-rule="required"/>
 		</div>
 		<div class="form-group">
             <label class="control-label x85">广告标题：</label>
-            <input type="text" name="advTitle" value="" placeholder="广告标题" size="20" data-rule="required">
+            <input type="text" name="advTitle" value="" placeholder="广告标题" size="20" data-rule="required" data-rule="required">
         </div>
 		<div class="form-group">
             <label class="control-label x85">广告链接：</label>

roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add.ftl

@@ -6,7 +6,7 @@
 		<input type="hidden" name="categoryType" value="${bean.categoryType}"/>
 		<div class="form-group">
             <label class="control-label x85">分类名称：</label>
-            <input type="text" name="categoryName" value="" placeholder="分类名称" size="20" required="required">
+            <input type="text" name="categoryName" value="" placeholder="分类名称" size="20" data-rule="required">
         </div>
         <div class="form-group">
             <label class="control-label x85">备注：</label>

roncoo-education-web-boss/src/main/resources/templates/course/courseCategory/add2.ftl

@@ -6,7 +6,7 @@
 		<input type="hidden" name="categoryType" value="${bean.categoryType}"/>
 		<div class="form-group">
             <label class="control-label x85">分类名称：</label>
-            <input type="text" name="categoryName" value="" placeholder="分类名称" size="20" required="required">
+            <input type="text" name="categoryName" value="" placeholder="分类名称" size="20" data-rule="required">
         </div>
         <div class="form-group">
             <label class="control-label x85">备注：</label>

roncoo-education-web-boss/src/main/resources/templates/course/courseRecommend/add.ftl

@@ -5,7 +5,7 @@
 		<div class="form-group">
             <label class="control-label x85">课程：</label>
             <input type="text" name="courseName" data-rule="required" value="请选择课程" size="30" data-toggle="lookup" data-url="${base}/course/courseRecommend/courseList?categoryId1=${categoryId!}" data-width="1000" data-height="800">
-			<input type="hidden" id="courseId" name="courseId" />
+			<input type="hidden" id="courseId" name="courseId" data-rule="required" />
         </div>
 		
 		<div class="form-group">

roncoo-education-web-boss/src/main/resources/templates/course/courseRecommend/edit.ftl

@@ -3,7 +3,10 @@
 	<form action="${base}/course/courseRecommend/update" data-toggle="validate" method="post" enctype="multipart/form-data">
 		<input type="hidden" name="id" value="${bean.id}"/>
 		
-		
+		 <div class="form-group">
+            <label class="control-label x85">排序：</label>
+            <input type="text" name="sort" value="${bean.sort!}" size="20" data-toggle="spinner" data-min="0" data-max="100" data-step="1" data-rule="integer">
+        </div>
 		
 		</table>
 	</form>

roncoo-education-web-boss/src/main/resources/templates/course/courseRecommend/list.ftl

@@ -3,8 +3,8 @@
 	<form id="pagerForm" data-toggle="ajaxsearch" action="${base}/course/courseRecommend/list" method="post">
 		<@pageHeadr />
 		<div class="bjui-searchBar">
-		<a href="${base}/course/courseRecommend/add?categoryId=${bean.categoryId!}" class="btn btn-default" data-toggle="dialog" data-icon="plus" data-id="courseCourseRecommend-add" data-options="{title:'添加', height:250}">课程添加 </a>
-		<span class="fa fa-info-circle red"> 因为展示的限制，课程只展示最前面的5个</span>
+		<a href="${base}/course/courseRecommend/add?categoryId=${bean.categoryId!}" class="btn btn-default" data-toggle="dialog" data-icon="plus" data-id="courseCourseRecommend-add" data-options="{title:'添加', height:300}">课程添加 </a>
+		<span class="fa fa-info-circle red"> 因为展示的限制，课程只展示5个</span>
 		</div>
 	</form>
 </div>
@@ -30,8 +30,15 @@
 				<td>${bean.sort!}</td>
 				<td><#list statusIdEnums as em><#if bean.statusId?? && bean.statusId==em.code><span class="${em.color}">${em.desc}</span></#if></#list></td>
 				<td>
-					<a href="${base}/course/courseRecommend/edit?id=${bean.id}" class="btn btn-green" data-toggle="navtab" data-options="{title:'${bean.courseName}',id:'${bean.courseName}'}">修改</a>
 				    <a href="${base}/course/courseRecommend/delete?id=${bean.id}" class="btn btn-red" data-toggle="doajax" data-id="courseCategory-delete" data-confirm-msg="确定要删除吗？">删除</a>
+					<a href="${base}/course/courseRecommend/edit?id=${bean.id}" class="btn btn-green" data-toggle="dialog" data-options="{title:'修改', height:150,width:400,id:'course-courseRecommend'}">修改</a>
+
+					<#if bean.statusId == 1>
+					<a href="${base}/course/courseRecommend/status?id=${bean.id}&statusId=0" class="btn btn-red" data-toggle="doajax" data-id="zone-update" data-confirm-msg="确定要禁用吗？">禁用</a>
+					</#if>
+					<#if bean.statusId == 0>
+					<a href="${base}/course/courseRecommend/status?id=${bean.id}&statusId=1" class="btn btn-green" data-toggle="doajax" data-id="zone-update" data-confirm-msg="确定要启用吗？">启用</a>
+					</#if>
 
 				</td>
 			</tr>

roncoo-education-web-boss/src/main/resources/templates/course/zone/add.ftl

@@ -4,7 +4,7 @@
 		
 		<div class="form-group">
             <label class="control-label x85">专区名称：</label>
-            <input type="text" name="zoneName" value="" placeholder="专区名称" size="20">
+            <input type="text" name="zoneName" value="" placeholder="专区名称" size="20" data-rule="required">
         </div>
 		<div class="form-group">
             <label class="control-label x85">描述：</label>

roncoo-education-web-boss/src/main/resources/templates/system/websiteNav/add.ftl

@@ -4,7 +4,7 @@
 	<input type="hidden" name="parentId" value="${parentId}"/>
 		<div class="form-group">
             <label class="control-label x85">导航名称：</label>
-            <input type="text" name="navName" value="" placeholder="导航名称" size="20" required="required">
+            <input type="text" name="navName" value="" placeholder="导航名称" size="20" data-rule="required">
         </div>
 	</form>
 </div>

roncoo-education-web-boss/src/main/resources/templates/system/websiteNav/list.ftl

@@ -16,7 +16,7 @@
 			
 			<br />
 			<br />
-			<a href="${base}/system/websiteNav/add?parentId=0" class="btn btn-default" data-toggle="dialog" data-icon="plus" data-id="websiteNav-add" data-options="{title:'添加', height:130, width:350}">添加 </a>
+			<a href="${base}/system/websiteNav/add?parentId=0" class="btn btn-default" data-toggle="dialog" data-icon="plus" data-id="websiteNav-add" data-options="{title:'添加', height:150, width:450}">添加 </a>
 		</div>
 	</form>
 </div>
@@ -51,7 +51,7 @@
 						<a href="${base}/system/websiteNav/updateStatusId?id=${bean.id}&statusId=1" class="btn btn-green" data-toggle="doajax" data-id="websiteNav-updateStatusId" data-confirm-msg="确定要启用吗？">启用</a>
 					</#if>
 					<#if bean.parentId == 0>
-                    	<a href="${base}/system/websiteNav/add?parentId=${bean.id}" class="btn btn-default" data-toggle="dialog" data-id="websiteNav-add" data-options="{title:'添加', height:130, width:350}">添加 </a>
+                    	<a href="${base}/system/websiteNav/add?parentId=${bean.id}" class="btn btn-default" data-toggle="dialog" data-id="websiteNav-add" data-options="{title:'添加', height:150, width:450}">添加 </a>
                 	</#if>
 				</td>
 			</tr>

roncoo-education-web-boss/src/main/resources/templates/user/platform/add.ftl

@@ -3,7 +3,7 @@
 	<form action="${base}/user/platform/save" data-toggle="validate" method="post">
 		<div class="form-group">
             <label class="control-label x85">客户端名称：</label>
-            <input type="text" name="clientName" value="" placeholder="客户端名称" size="20">
+            <input type="text" name="clientName" value="" placeholder="客户端名称" size="20" data-rule="required">
         </div>
         <div class="form-group">
             <label class="control-label x85">备注：</label>

roncoo-education-web-boss/src/main/resources/templates/user/platform/edit.ftl

@@ -5,7 +5,7 @@
 		
 		<div class="form-group">
             <label class="control-label x85">客户端名称：</label>
-            <input type="text" name="clientName" value="${bean.clientName!}" placeholder="客户端名称" size="20">
+            <input type="text" name="clientName" value="${bean.clientName!}" placeholder="客户端名称" size="20" data-rule="required">
         </div>
 		<div class="form-group">
             <label for="statusId" class="control-label x85">状态：</label>