Merge remote-tracking branch 'origin/master'

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

@@ -45,7 +45,6 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 			sysMenus = sysMenuDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId(),menuQueryInfo.getHid());
 		}
 		for (SysMenu menu:sysMenus) {
-			menu.setParentPermission(menu.getPermission());
 			menu = getTree(menu,menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId(),menuQueryInfo.getHid());
 		}
 		return sysMenus;
@@ -66,7 +65,6 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 			menu.setSysMenus(sysMenus);
 			//遍历子节点....
 			for (SysMenu sysMenu : sysMenus) {
-				sysMenu.setParentPermission(menu.getParentPermission());
 				getTree(sysMenu,delFlag,userId,hid);
 			}
 		}

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

@@ -10,6 +10,7 @@
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
         <result column="permission_" property="permission"/>
+        <result column="parent_permission_" property="parentPermission"/>
         <result column="path_" property="path"/>
         <result column="parent_id_" property="parentId"/>
         <result column="icon_" property="icon"/>
@@ -38,8 +39,8 @@
     <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_menu
-        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_)
-        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid})
+        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -58,6 +59,9 @@
             <if test="permission != null">
                 permission_ = #{permission},
             </if>
+            <if test="parentPermission != null">
+                parent_permission_ = #{parentPermission},
+            </if>
             <if test="path != null">
                 path_ = #{path},
             </if>

mec-web/src/main/java/com/ym/mec/web/controller/EducationCourseScheduleController.java

@@ -0,0 +1,42 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
+import com.ym.mec.biz.service.CourseScheduleService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/1/8
+ */
+
+@RestController
+@RequestMapping("educationCourseSchedule")
+@Api(tags = "教务端课程计划服务")
+public class EducationCourseScheduleController extends BaseController {
+
+    @Autowired
+    private CourseScheduleService scheduleService;
+
+    @ApiOperation(value = "根据月份获取乐团在该月有课的日期")
+    @GetMapping("/getCourseScheduleDateByMonth")
+    public Object getCourseScheduleDateByMonth(@ApiParam(value = "月份", required = true) @RequestParam Date month) {
+        return succeed(scheduleService.getCourseScheduleDates(month));
+    }
+
+    @ApiOperation(value = "根据日期获取当日排课")
+    @GetMapping("/getCourseSchedulesWithDate")
+    public Object getCourseSchedulesWithDate(CourseScheduleQueryInfo queryInfo) {
+        return succeed(scheduleService.getCourseSchedulesWithDateByEdu(queryInfo));
+    }
+
+}