导入

src/main/java/com/ssj/dao/sys/imlibuser/dao/TbClassTeacherDao.java

@@ -47,6 +47,9 @@ public interface TbClassTeacherDao extends JpaRepository<TbClassTeacher, String>
 	
 	@Query(nativeQuery = true, value = " SELECT * from tb_class_teacher t where t.class_id=?1 and t.type=2 and t.status = 1  LIMIT 1")
 	TbClassTeacher getTbLibImTeacherByClassType(String classId);
+	
+	@Query(nativeQuery = true, value = " SELECT * from tb_class_teacher t where t.class_id=?1 AND t.teacher_id=?2 AND t.type=?3 and t.status = 1 order by status desc LIMIT 1 ")
+	TbClassTeacher getTbLibImTeacherByClassIdAndType(String classId,String teacherId,Integer type);
 
 
 }

src/main/java/com/ssj/dao/sys/imlibuser/dao/impl/TbClassQueryDaoImpl.java

@@ -25,10 +25,10 @@ public class TbClassQueryDaoImpl implements TbClassQueryDao {
 		List<Object> queryParams = new ArrayList<Object>();
 		selSql.append(" SELECT t.*    ");
 		selSql.append(" ,( SELECT COUNT(DISTINCT(v.id)) from tb_lib_vip v  where v.stat=1 AND v.lib_id=t.id  ) as student_num     ");
-		selSql.append(" ,( SELECT COUNT(DISTINCT(a.user_id)) from tb_lib_manager a  where a.state=1  AND a.type in (2,10,15) AND a.lib_id=t.id  ) as teacher_num    ");
+		selSql.append(" ,( SELECT COUNT(DISTINCT(a.teacher_id)) from tb_class_teacher a  where a.status=1 and a.type=1 AND a.lib_id=t.id ) as teacher_num    ");
 		selSql.append(" ,( SELECT COUNT(DISTINCT(a.user_id)) from tb_lib_manager a  where a.state=1  AND a.type in (4) AND a.lib_id=t.id  ) as principal_num    ");
 		selSql.append(" ,( SELECT COUNT(DISTINCT(a.user_id)) from tb_lib_manager a  where a.state=1  AND a.type in (19) AND a.lib_id=t.id  ) as leader_num    ");
-		selSql.append(" ,( SELECT COUNT(DISTINCT(a.teacher_id)) from tb_class_teacher a  where a.status=1  AND a.lib_id=t.id  ) as headmaster_num    ");
+		selSql.append(" ,( SELECT COUNT(DISTINCT(a.teacher_id)) from tb_class_teacher a  where a.status=1 and a.type=2 AND a.lib_id=t.id  ) as headmaster_num    ");
 		selSql.append(" ,IFNULL(( SELECT SUM(m.port_num) from fx_merchant m WHERE m.lib_id=t.id GROUP BY m.lib_id),0) as port_num ");
 		selSql.append(" from tb_lib_join t    ");
 		selSql.append(" where t.type=1    ");
@@ -140,12 +140,16 @@ public class TbClassQueryDaoImpl implements TbClassQueryDao {
 	public Page<Map<String, Object>> findHeadmasterByPage(Map<String, Object> searchParam, Pageable pageable) {
 		StringBuffer selSql = new StringBuffer();
 		List<Object> queryParams = new ArrayList<Object>();
-		selSql.append("  SELECT u.* from tb_class_teacher t LEFT JOIN tb_user u ON t.teacher_id=u.id   ");
-		selSql.append("  where t.status=1 AND t.lib_id=?    ");
+		selSql.append("  SELECT u.*,c.grade,c.class_name from tb_class_teacher t LEFT JOIN tb_user u ON t.teacher_id=u.id LEFT JOIN tb_class c ON t.class_id=c.id   ");
+		selSql.append("  where t.status=1 AND t.lib_id=?  ");
 		queryParams.add(searchParam.get("libId"));
+		if(!"".equals(searchParam.get("type"))){
+			selSql.append(" AND t.type=? ");
+	        queryParams.add(searchParam.get("type"));
+		}
 		if(!"".equals(searchParam.get("name"))){
-			  selSql.append(" AND u.user_name LIKE  CONCAT('%',?,'%')   ");
-	          queryParams.add(searchParam.get("name"));
+			 selSql.append(" AND u.user_name LIKE  CONCAT('%',?,'%')   ");
+	         queryParams.add(searchParam.get("name"));
 	    }
 		selSql.append(" ORDER BY t.create_time DESC  ");
 		return dao.findPage(selSql.toString(),queryParams.toArray(), pageable);

src/main/java/com/ssj/service/sys/imlibuser/service/TbClassTeacherService.java

@@ -27,6 +27,8 @@ public interface TbClassTeacherService extends BaseService<TbClassTeacher, Strin
 	  */
 	 TbClassTeacher getTbLibImTeacherByClassId(String classId,String teacherId);
 	 
+	 TbClassTeacher getTbLibImTeacherByClassIdAndType(String classId,String teacherId,Integer type);
+	 
 	 TbClassTeacher getTbLibImTeacherByClassType(String classId);
 
 	/**

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassTeacherServiceImpl.java

@@ -102,4 +102,9 @@ public class TbClassTeacherServiceImpl extends BaseServiceImpl<TbClassTeacher, S
 	public TbClassTeacher getTbLibImTeacherByClassType(String classId){
 		return dao.getTbLibImTeacherByClassType(classId);
 	}
+
+	@Override
+	public TbClassTeacher getTbLibImTeacherByClassIdAndType(String classId, String teacherId, Integer type) {
+		return dao.getTbLibImTeacherByClassIdAndType(classId, teacherId, type);
+	}
 }

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassTeacherTempServiceImpl.java

@@ -253,7 +253,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					tbClass=tbClassService.save(tbClass);
 				}
 				
-				TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassId(tbClass.getId(), user.getId());
+				TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassIdAndType(tbClass.getId(),user.getId(),1);
 				if(tbClassTeacher==null) {
 					tbClassTeacher=new TbClassTeacher();
 					tbClassTeacher.setClassId(tbClass.getId());
@@ -581,7 +581,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 				}
 				TbClassTeacher tbClassType=tbClassTeacherService.getTbLibImTeacherByClassType(tbClass.getId());
 				if(tbClassType==null) {
-					TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassId(tbClass.getId(),user.getId());
+					TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassIdAndType(tbClass.getId(),user.getId(),2);
 					if(tbClassTeacher==null) {
 						 tbClassTeacher=new TbClassTeacher();
 						 tbClassTeacher.setClassId(tbClass.getId());

src/main/java/com/ssj/sys/controller/ImLibUserController.java

@@ -997,14 +997,15 @@ public class ImLibUserController extends BaseController {
 	
 	
 	//老师列表
-	@RequestMapping(value="/headmaster/list/{libId}")
-	public String headmasterList(Model model,@PathVariable String libId,
+	@RequestMapping(value="/headmaster/list/{libId}/{type}")
+	public String headmasterList(Model model,@PathVariable String libId,@PathVariable String type,
             @RequestParam(required = false, defaultValue = "100") int pageSize,
             @RequestParam(required = false, defaultValue = "1") int pageNo) {
 		
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("libId", libId);
 		params.put("name", request.getParameter("name")==null?"":request.getParameter("name"));
+		params.put("type", type);
         SplitPage sp = new SplitPage();
         sp.setAction(request.getRequestURI());
         sp.setPageNo(pageNo);

src/main/resources/templates/sys/imlibuser/headmasterList.html

@@ -60,8 +60,9 @@
 		    <tr>
 		    	<th>老师姓名</th>
 <!-- 		    	<th>学校名称</th> -->
-<!-- 		    	<th>年级</th> -->
 		    	<th>老师电话</th>
+		    	<th>年级</th>
+		    	<th>班级</th>
 <!-- 		    	<th>是否批改作业</th> -->
 		        <th>操作</th>
 		    </tr> 
@@ -70,8 +71,9 @@
 			<tr th:each="item:${list}" >
 				<td th:text="${item.user_name}"></td>
 <!-- 				<td th:text="${item.school}"></td> -->
-<!-- 				<td th:text="${item.grade}"></td> -->
 				<td th:text="${item.mobile}"></td>
+				<td th:text="${item.grade}"></td>
+				<td th:text="${item.class_name}"></td>
 <!-- 				<td > -->
 <!-- 					<a th:if="${item.is_correct==1}" th:href="${'javascript:teacherIsCorrectSave(''' + item.user_id + ''',0)'}"  class="tablelink" style="color:red">取消批改</a> -->
 <!-- 					<a th:if="${item.is_correct!=1}" th:href="${'javascript:teacherIsCorrectSave(''' + item.user_id + ''',1)'}"  class="tablelink">设置批改</a> -->

src/main/resources/templates/sys/imlibuser/schoolList.html

@@ -146,12 +146,12 @@
 					</a>
 				</td>
 				<td >
-					<a th:href="${sysUrl+'/sys/imlibuser/headmaster/list/'+item.id}"  class="tablelink">
+					<a th:href="${sysUrl+'/sys/imlibuser/headmaster/list/'+item.id+'/2'}"  class="tablelink">
 						[[${item.headmaster_num+' 人'}]]
 					</a>
 				</td>
 				<td >
-					<a th:href="${sysUrl+'/sys/imlibuser/teacher/list/'+item.id+'/4'}"  class="tablelink">
+					<a th:href="${sysUrl+'/sys/imlibuser/headmaster/list/'+item.id+'/1'}"  class="tablelink">
 						[[${item.teacher_num+' 人'}]]
 					</a>
 				</td>

src/main/resources/templates/sys/imlibuser/teacherList.html

@@ -81,7 +81,7 @@
 <!-- 					<a th:if="${item.is_correct!=1}" th:href="${'javascript:teacherIsCorrectSave(''' + item.user_id + ''',1)'}"  class="tablelink">设置批改</a> -->
 <!-- 				</td> -->
 				<td>
-					<a th:href="${'javascript:teacherDel(''' + item.user_id + ''')'}"  class="tablelink">删除老师</a>
+<!-- 					<a th:href="${'javascript:teacherDel(''' + item.user_id + ''')'}"  class="tablelink">删除老师</a> -->
 				</td>
 			</tr>
 		</tbody>