学校活动

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

@@ -64,4 +64,12 @@ public interface SchoolActivityDetailUserService extends IService<SchoolActivity
      * @param schoolActivityStudents 活动人员列表
      */
     List<SchoolActivityWrapper.SchoolActivitySubject> getSchoolActivitySubjects(List<SchoolActivityWrapper.SchoolActivityStudent> schoolActivityStudents);
+
+
+    /**
+     * 获取学生列表
+     *
+     * @param query 查询条件
+     */
+    List<SchoolActivityWrapper.SchoolActivitySubject> getUserList(SchoolActivityWrapper.SchoolActivityStudentQuery query);
 }

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

@@ -42,10 +42,4 @@ public interface SchoolActivityService extends IService<SchoolActivity>  {
      */
      Boolean update(SchoolActivityWrapper.SchoolActivityInfo schoolActivity);
 
-    /**
-     * 获取学生列表
-     *
-     * @param query 查询条件
-     */
-    List<SchoolActivityWrapper.SchoolActivitySubject> getUserList(SchoolActivityWrapper.SchoolActivityStudentQuery query);
 }

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

@@ -116,7 +116,7 @@ public class SchoolActivityDetailServiceImpl extends ServiceImpl<SchoolActivityD
                 .map(SchoolActivityDetailWrapper.SchoolActivityDetail::getId)
                 .collect(Collectors.toList());
 
-        Map<Integer, List<SchoolActivityWrapper.SchoolActivitySubject>> studentListMap = schoolActivityDetailUserService.getSchoolActivitySubjectMapByDetailIds(detailIds);
+//        Map<Integer, List<SchoolActivityWrapper.SchoolActivitySubject>> studentListMap = schoolActivityDetailUserService.getSchoolActivitySubjectMapByDetailIds(detailIds);
 
         // 设置乐团名
         // 乐团ID集合
@@ -138,10 +138,15 @@ public class SchoolActivityDetailServiceImpl extends ServiceImpl<SchoolActivityD
         for (SchoolActivityDetailWrapper.SchoolActivityDetail schoolActivityDetail : schoolActivityDetails) {
 
             // 设置声部 人员数据
-            List<SchoolActivityWrapper.SchoolActivitySubject> schoolActivitySubjects = studentListMap.get(schoolActivityDetail.getId());
-            if (!CollectionUtils.isEmpty(schoolActivitySubjects)) {
+            SchoolActivityWrapper.SchoolActivityStudentQuery query = new SchoolActivityWrapper.SchoolActivityStudentQuery();
+            query.setMusicGroupId(schoolActivityDetail.getMusicGroupId().toString());
+            query.setActivityDetailId(schoolActivityDetail.getId());
+            List<SchoolActivityWrapper.SchoolActivitySubject> schoolActivitySubjects = schoolActivityDetailUserService.getUserList(query);
+
+//            List<SchoolActivityWrapper.SchoolActivitySubject> schoolActivitySubjects = studentListMap.get(schoolActivityDetail.getId());
+//            if (!CollectionUtils.isEmpty(schoolActivitySubjects)) {
                 schoolActivityDetail.setStudentList(schoolActivitySubjects);
-            }
+//            }
 
             // 设置乐团名
             MusicGroup musicGroup = groupMap.get(schoolActivityDetail.getMusicGroupId());

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

@@ -3,8 +3,10 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.entity.SchoolActivity;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.mapper.SchoolActivityMapper;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper;
 import com.ym.mec.biz.service.StudentService;
 import com.ym.mec.biz.service.SubjectService;
@@ -36,6 +38,9 @@ public class SchoolActivityDetailUserServiceImpl extends ServiceImpl<SchoolActiv
     @Autowired
     private SubjectService subjectService;
 
+    @Autowired
+    private SchoolActivityMapper schoolActivityMapper;
+
     /**
      * 查询详情
      * @param id 详情ID
@@ -198,4 +203,16 @@ public class SchoolActivityDetailUserServiceImpl extends ServiceImpl<SchoolActiv
         return schoolActivitySubjects;
     }
 
+    /**
+     * 获取学生列表
+     *
+     * @param query 查询条件
+     */
+    @Override
+    public List<SchoolActivityWrapper.SchoolActivitySubject> getUserList(SchoolActivityWrapper.SchoolActivityStudentQuery query) {
+
+        List<SchoolActivityWrapper.SchoolActivityStudent> schoolActivityStudents = schoolActivityMapper.getUserList(query);
+
+        return this.getSchoolActivitySubjects(schoolActivityStudents);
+    }
 }

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

@@ -181,16 +181,4 @@ public class SchoolActivityServiceImpl extends ServiceImpl<SchoolActivityMapper,
 
     }
 
-    /**
-     * 获取学生列表
-     *
-     * @param query 查询条件
-     */
-    @Override
-    public List<SchoolActivityWrapper.SchoolActivitySubject> getUserList(SchoolActivityWrapper.SchoolActivityStudentQuery query) {
-
-        List<SchoolActivityWrapper.SchoolActivityStudent> schoolActivityStudents = baseMapper.getUserList(query);
-
-        return schoolActivityDetailUserService.getSchoolActivitySubjects(schoolActivityStudents);
-    }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.config.validator.group.ValidGroups;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper;
+import com.ym.mec.biz.service.SchoolActivityDetailUserService;
 import com.ym.mec.biz.service.SchoolActivityService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -28,6 +29,9 @@ public class SchoolActivityController extends BaseController {
     @Autowired
     private SchoolActivityService schoolActivityService;
 
+    @Autowired
+    private SchoolActivityDetailUserService schoolActivityDetailUserService;
+
 	@ApiOperation(value = "详情", notes = "学校活动-根据详情ID查询单条, 传入id")
     @GetMapping("/detail/{id}")
     public HttpResponseResult<SchoolActivityWrapper.SchoolActivityInfo> detail(@PathVariable("id") Long id) {
@@ -55,7 +59,7 @@ public class SchoolActivityController extends BaseController {
     @PostMapping("/userList")
     public HttpResponseResult<List<SchoolActivityWrapper.SchoolActivitySubject>> userList(@RequestBody SchoolActivityWrapper.SchoolActivityStudentQuery query) {
 
-        return succeed(schoolActivityService.getUserList(query));
+        return succeed(schoolActivityDetailUserService.getUserList(query));
     }
     
     @ApiOperation(value = "新增", notes = "学校活动- 传入 SchoolActivityWrapper.SchoolActivity")