合作单位

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SchoolActivityWrapper.java

@@ -48,6 +48,9 @@ public class SchoolActivityWrapper {
         @ApiModelProperty("关键字匹配")
 		private String keyword;
 
+        @ApiModelProperty("合作单位")
+        private Integer cooperationOrganId;
+
 
         @ApiModelProperty("活动类型 开放日 OPEN_DAY 汇演 PERFORMANCE 音乐会 CONCERT 比赛 COMPETITION 讲座 LECTURE 校庆 SCHOOL_DAY 迎宾 WELCOME 其他 OTHER")
         private ESchoolActivityType type;

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

@@ -435,7 +435,11 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "学校端-场地管理列表")
     @PostMapping("/teachingPointCourse")
-    public HttpResponseResult<PageInfo<TeachingPointWrapper.CourseTeachingPoint>> teachingPoint(@RequestBody TeachingPointWrapper.TeachingPointQuery queryInfo) {
+    public HttpResponseResult<PageInfo<TeachingPointWrapper.CourseTeachingPoint>> teachingPoint(@RequestBody TeachingPointWrapper.TeachingPointQuery queryInfo,@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed(new PageInfo<>());
+        }
+        queryInfo.setCooperationOrganId(coopId);
 
         IPage<TeachingPointWrapper.CourseTeachingPoint> courseTeachingPointIPage = courseScheduleService.teachingPointCourse(queryInfo);
 
@@ -444,7 +448,12 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "学校端-场地设置列表")
     @PostMapping("/teachingPointClass")
-    public HttpResponseResult<PageInfo<TeachingPointWrapper.ClassTeachingPoint>> teachingPointClass(@RequestBody TeachingPointWrapper.TeachingPointQuery queryInfo) {
+    public HttpResponseResult<PageInfo<TeachingPointWrapper.ClassTeachingPoint>> teachingPointClass(@RequestBody TeachingPointWrapper.TeachingPointQuery queryInfo,@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed(new PageInfo<>());
+        }
+        queryInfo.setCooperationOrganId(coopId);
+
         IPage<TeachingPointWrapper.ClassTeachingPoint> classTeachingPointIPage = courseScheduleService.teachingPointClass(queryInfo);
 
         return succeed(PageUtil.pageInfo(classTeachingPointIPage));
@@ -452,9 +461,11 @@ public class ClassGroupController extends BaseController {
 
     @ApiOperation(value = "学校端-场地管理红点")
     @PostMapping("/teachingPointRemind")
-    public HttpResponseResult<Boolean> teachingPointRemind() {
-        Integer cooperationOrganId = 1;
-        return succeed(classGroupDao.teachingPointRemind(cooperationOrganId) >0);
+    public HttpResponseResult<Boolean> teachingPointRemind(@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed(false);
+        }
+        return succeed(classGroupDao.teachingPointRemind(coopId) >0);
     }
 
 

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

@@ -87,8 +87,11 @@ public class CooperationOrganController extends BaseController {
 
     @ApiOperation(value = "合作单位的乐团")
     @GetMapping("/musicGroupPage")
-    public HttpResponseResult<List<MusicGroup>> musicGroupPage(Integer id) {
-        return succeed(cooperationOrganService.musicGroupPage(id));
+    public HttpResponseResult<List<MusicGroup>> musicGroupPage(@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed();
+        }
+        return succeed(cooperationOrganService.musicGroupPage(coopId));
     }
 
 }

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

@@ -415,8 +415,12 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "学校端-人数统计")
     @PostMapping("/userCount")
-    public HttpResponseResult<StudentWrapper.StudentStat> userCount(@RequestBody StudentWrapper.StudentQuery queryInfo) {
+    public HttpResponseResult<StudentWrapper.StudentStat> userCount(@RequestBody StudentWrapper.StudentQuery queryInfo,@RequestHeader Integer coopId) {
 
+        if (coopId == null) {
+            return succeed();
+        }
+        queryInfo.setCooperationOrganId(coopId);
 
 
         return succeed(null);
@@ -426,7 +430,13 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "学校端-学员分页")
     @PostMapping("/userPage")
-    public HttpResponseResult<PageInfo<StudentWrapper.StudentList>> userPage(@RequestBody StudentWrapper.StudentQuery queryInfo) {
+    public HttpResponseResult<PageInfo<StudentWrapper.StudentList>> userPage(@RequestBody StudentWrapper.StudentQuery queryInfo,@RequestHeader Integer coopId) {
+
+        if (coopId == null) {
+            return succeed();
+        }
+        queryInfo.setCooperationOrganId(coopId);
+
 
 
         IPage<StudentWrapper.StudentList> page = com.microsvc.toolkit.common.response.paging.QueryInfo.getPage(queryInfo);
@@ -438,24 +448,33 @@ public class StudentManageController extends BaseController {
 
     @ApiOperation(value = "学校端-学生所在乐团")
     @PostMapping("/userMusicGroup")
-    public HttpResponseResult<List<MusicGroup>> userMusicGroup(@RequestParam Integer studentId) {
+    public HttpResponseResult<List<MusicGroup>> userMusicGroup(@RequestParam Integer studentId,@RequestHeader Integer coopId) {
 
         return succeed(null);
     }
 
     @ApiOperation(value = "学校端-学员详情")
     @PostMapping("/userDetail")
-    public HttpResponseResult<StudentWrapper.StudentDetail> userDetail(@RequestBody StudentWrapper.StudentQuery queryInfo) {
+    public HttpResponseResult<StudentWrapper.StudentDetail> userDetail(@RequestBody StudentWrapper.StudentQuery queryInfo,@RequestHeader Integer coopId) {
         if (queryInfo.getStudentId() == null) {
             return failed("参数错误");
         }
+
+        if (coopId == null) {
+            return succeed();
+        }
+        queryInfo.setCooperationOrganId(coopId);
+
+
         return succeed(null);
     }
 
 
     @ApiOperation(value = "学校端-修改学员班级信息")
     @PostMapping("/updateGrade")
-    public HttpResponseResult<Boolean> updateGrade(@Valid @RequestBody StudentWrapper.UpdateStudent updateStudent) {
+    public HttpResponseResult<Boolean> updateGrade(@Valid @RequestBody StudentWrapper.UpdateStudent updateStudent,@RequestHeader Integer coopId) {
+        updateStudent.setCooperationOrganId(coopId);
+
         return succeed(null);
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/school/CoursePatrolEvaluationController.java

@@ -43,7 +43,11 @@ public class CoursePatrolEvaluationController extends BaseController {
 
     @ApiOperation(value = "学校端-查询巡堂统计分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
     @PostMapping("/pageStat")
-    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat>> pageStat(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query) {
+    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat>> pageStat(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query,@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed();
+        }
+        query.setCooperationOrganId(coopId);
 
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat> page = coursePatrolEvaluationService.pageStat(QueryInfo.getPage(query), query);
         return succeed(QueryInfo.pageInfo(page));
@@ -62,8 +66,11 @@ public class CoursePatrolEvaluationController extends BaseController {
 
     @ApiOperation(value = "学校端-查询巡堂分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
     @PostMapping("/page")
-    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo>> page(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query) {
-
+    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo>> page(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query,@RequestHeader Integer coopId) {
+        if (coopId == null) {
+            return succeed();
+        }
+        query.setCooperationOrganId(coopId);
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo> pages = coursePatrolEvaluationService.selectPage(QueryInfo.getPage(query), query);
         
         return succeed(QueryInfo.pageInfo(pages));

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolActivityController.java

@@ -39,8 +39,12 @@ public class SchoolActivityController extends BaseController {
     
     @ApiOperation(value = "查询分页", notes = "学校活动- 传入 SchoolActivityWrapper.SchoolActivityQuery") 
     @PostMapping("/page")
-    public HttpResponseResult<PageInfo<SchoolActivityWrapper.SchoolActivity>> page(@RequestBody SchoolActivityWrapper.SchoolActivityQuery query) {
-        
+    public HttpResponseResult<PageInfo<SchoolActivityWrapper.SchoolActivity>> page(@RequestBody SchoolActivityWrapper.SchoolActivityQuery query,@RequestHeader Integer coopId) {
+
+        if (coopId == null) {
+            return succeed();
+        }
+        query.setCooperationOrganId(coopId);
         IPage<SchoolActivityWrapper.SchoolActivity> pages = schoolActivityService.selectPage(QueryInfo.getPage(query), query);
         
         return succeed(QueryInfo.pageInfo(pages));