update

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/enums/SysUserType.java

@@ -6,7 +6,7 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum SysUserType implements BaseEnum<String, SysUserType> {
 
-	STUDENT("学生"), EDU_TEACHER("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置");
+	STUDENT("学生"), EDU_TEACHER("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员");
 
 	private String desc;
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -43,7 +43,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	public List<SysMenu> findByUser(MenuQueryInfo menuQueryInfo) {
 		SysUser sysUser = sysUserDao.get(menuQueryInfo.getUserId());
 		List<SysMenu> sysMenus = null;
-		if(sysUser.getUserType() == SysUserType.SYSTEM){
+		if(sysUser.getUserType() == SysUserType.ADMIN){
 			menuQueryInfo.setUserId(null);
 			sysMenus = sysMenuDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
 		}else {

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -157,7 +157,7 @@
         LEFT JOIN sys_role_menu srm ON sur.role_id_ = srm.role_id_
         LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
         <include refid="queryTree"/>
-        ORDER BY sm.sort_
+        ORDER BY sm.sort_ DESC
     </select>
 
     <select id="findList" resultMap="SysMenu">

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -73,10 +73,17 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     /**
      * 根据教师编号获取教师所在乐团，带了哪些班级
      *
-     * @param userId
+     * @param params
+     * @return
+     */
+    List<TeacherMusicClassInfoDto> queryGroupCourses(Map<String, Object> params);
+
+    /**
+     * COUNT教师所在乐团带了哪些班级
+     * @param params
      * @return
      */
-    List<TeacherMusicClassInfoDto> queryGroupCourses(Integer userId);
+    int countGroupCourses(Map<String, Object> params);
 
     /**
      * 获取老师VIP课程信息列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherLeaveRecordDto.java

@@ -0,0 +1,51 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class TeacherLeaveRecordDto extends QueryInfo {
+
+    @ApiModelProperty(value = "开始时间",required = false)
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间",required = false)
+    private String endTime;
+
+    @ApiModelProperty(value = "请假类型",required = false)
+    private String leaveRecordType;
+
+    @ApiModelProperty(value = "教师编号",required = false)
+    private Integer teacherId;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getLeaveRecordType() {
+        return leaveRecordType;
+    }
+
+    public void setLeaveRecordType(String leaveRecordType) {
+        this.leaveRecordType = leaveRecordType;
+    }
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -2,7 +2,6 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.page.StudentPayLogQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
@@ -96,10 +95,10 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     /**
      * 获取老师乐团课程信息列表
      *
-     * @param teacherId
+     * @param queryInfo
      * @return
      */
-    List<TeacherMusicClassInfoDto> getTeacherMusicClass(Integer teacherId);
+    PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(QueryInfo queryInfo);
 
     /**
      * 获取老师VIP课程信息列表

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

@@ -239,19 +239,29 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<TeacherMusicClassInfoDto> getTeacherMusicClass(Integer teacherId) {
-        List<TeacherMusicClassInfoDto> teacherMusics = classGroupDao.queryGroupCourses(teacherId);
-        //获取老师在当前乐团出勤次数
-        if(teacherMusics != null && teacherMusics.size() > 0){
+    public PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(QueryInfo queryInfo) {
+        PageInfo<TeacherMusicClassInfoDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+        List<TeacherMusicClassInfoDto> dataList = null;
+        int count = classGroupDao.countGroupCourses(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = classGroupDao.queryGroupCourses(params);
             HashMap<String,Object> param = new HashMap<>();
-            param.put("teacherId",teacherId);
+            param.put("teacherId",queryInfo.getSearch());
             param.put("attendanceStatus",YesOrNoEnum.YES);
-            teacherMusics.forEach(e->{
+            dataList.forEach(e->{
                 param.put("musicGroupId",e.getMusicGroupId());
                 e.setAttendanceNum(teacherAttendanceDao.getTeacherPersonalAttendancesCount(param));
             });
         }
-        return teacherMusics;
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
     }
 
     @Override

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

@@ -202,7 +202,8 @@
         LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
 		LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
-        WHERE cgtm.user_id_ = #{userId} AND cg.del_flag_ = 0 AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
+        WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
+        <include refid="global.limit"/>
     </select>
 
 
@@ -499,6 +500,14 @@
         GROUP BY
             vg.id_,cg.id_
     </select>
+    <select id="countGroupCourses" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT mg.id_)
+        FROM class_group_teacher_mapper cgtm
+        LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
+        LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
+		LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
+        WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
+    </select>
 
     <!-- 增加实际学生人数 -->
     <update id="addStudentNum" parameterType="com.ym.mec.biz.dal.entity.ClassGroup">

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

@@ -96,15 +96,30 @@
 	</delete>
 
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="TeacherLeaveRecord"
-		parameterType="map">
-		SELECT * FROM teacher_leave_record ORDER BY id_
+	<select id="queryPage" resultMap="TeacherLeaveRecord" parameterType="map">
+		SELECT * FROM teacher_leave_record tlr
+		<include refid="queryLeavePage"/>
+		ORDER BY tlr.id_
 		<include refid="global.limit" />
 	</select>
 
+	<sql id="queryLeavePage">
+		<where>
+			<if test="startTime != null and startTime != ''">
+				AND tlr.create_time_ &gt;= #{startTime}
+			</if>
+			<if test="endTime != null and endTime != ''">
+				AND tlr.create_time_ &lt;= #{endTime}
+			</if>
+			<if test="leaveCategoryId != null">
+				AND tlr.leave_category_id_ = #{leaveCategoryId}
+			</if>
+		</where>
+	</sql>
+
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		teacher_leave_record
+		SELECT COUNT(tlr.id_) FROM teacher_leave_record tlr
+		<include refid="queryLeavePage"/>
 	</select>
 </mapper>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -78,8 +78,8 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "获取老师乐团课程信息列表")
     @GetMapping("/getTeacherMusicClass")
     @ApiParam(value = "教师编号", required = true)
-    public Object getTeacherMusicClass(Integer teacherId){
-        return succeed(classGroupService.getTeacherMusicClass(teacherId));
+    public Object getTeacherMusicClass(QueryInfo queryInfo){
+        return succeed(classGroupService.getTeacherMusicClass(queryInfo));
     }
 
     @ApiOperation(value = "获取老师VIP课程信息列表")

mec-web/src/main/java/com/ym/mec/web/controller/teacher/TeacherLeaveRecordController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller.teacher;
 
+import com.ym.mec.biz.dal.dto.TeacherLeaveRecordDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -31,15 +32,9 @@ public class TeacherLeaveRecordController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "根据教师请假记录编号查询教师请假记录")
-    @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "教师请假记录编号", required = true) @PathVariable("id") Long id){
-        return succeed(teacherLeaveRecordService.get(id));
-    }
-
     @ApiOperation(value = "分页查询教师请假记录列表")
     @GetMapping("/queryPage")
-    public Object queryPage(QueryInfo queryInfo){
+    public Object queryPage(TeacherLeaveRecordDto queryInfo){
         return succeed(teacherLeaveRecordService.queryPage(queryInfo));
     }