Bläddra i källkod

1、课表organ_id_字段初始化;
2、课表列表去除团体名和班级名,搜索更改为按团体编号/课程编号/课程名搜索
3、修复对外课程无部门编号
4、节假日获取方式调整
5、线上乐团课创建

Joe 5 år sedan
förälder
incheckning
d06c07374c

+ 15 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/OnlineMusicGroupService.java

@@ -0,0 +1,15 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.common.page.QueryInfo;
+
+import java.util.List;
+
+public interface OnlineMusicGroupService {
+
+    /**
+     * 创建线上乐团班级
+     */
+    void createOnlineMusicClassGroup();
+
+}

+ 14 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/OnlineMusicGroupServiceImpl.java

@@ -0,0 +1,14 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.service.OnlineMusicGroupService;
+
+import java.util.List;
+
+public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
+
+    @Override
+    public void createOnlineMusicClassGroup() {
+
+    }
+}

+ 58 - 0
mec-web/src/main/java/com/ym/mec/web/controller/education/EduOnlineMusicGroupController.java

@@ -0,0 +1,58 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RequestMapping("eduCourseReview")
+@Api(tags = "教务端课程评价")
+@RestController
+public class EduOnlineMusicGroupController extends BaseController {
+
+    @Autowired
+    private MusicGroupService musicGroupService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
+
+    @ApiOperation(value = "分页查询乐团列表")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('musicGroup/queryPage')")
+    public Object queryPage(MusicGroupQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setOrganId(employee.getOrganIdList());
+            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+                return failed("用户所在分部异常");
+            }else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
+                }
+            }
+        }
+        return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
+    }
+
+}