Merge branch 'feature/0427-school' into master_saas

.idea/httpRequests/http-requests-log.http

@@ -1,3 +1,13 @@
+GET http://127.0.0.1:8005/vipGroupManage/liveGroupDetail/96
+Authorization: bearer b897da27-5a37-47df-8e76-54d80a61a55d
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-02T163244.200.json
+
+###
+
 GET http://127.0.0.1:8005/open/sysConfig/queryByParamName?paramName=open_coop_id
 Connection: Keep-Alive
 User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
@@ -823,24 +833,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-POST http://127.0.0.1:8005/open/school/staffSave
-Content-Type: application/json
-coopId: 19
-tenantId: 1
-Content-Length: 129
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "schoolId": 3,
-  "userType": "ORCHESTRA_LEADER",
-  "username": "测试113",
-  "mobile": "19900990114",
-  "smsCode" : 666666
-}
-
-<> 2023-05-29T183339.200.json
-
-###
-

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

@@ -120,6 +120,12 @@ public class SchoolActivityWrapper {
         @ApiModelProperty("合作单位ID")
         private Integer cooperationOrganId;
 
+        @ApiModelProperty("合作单位名称")
+        private String cooperationOrganName;
+
+        @ApiModelProperty("合作单位头像")
+        private String cooperationOrganLogo;
+
         @ApiModelProperty(value = "活动开始日期",required = true)
         @NotNull(message = "活动开始日期不能为空")
         private Date startTime;

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

@@ -5390,15 +5390,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     public List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> getSummaryOfCurrentSemesterCourses(Integer coopId) {
 		//获取合作单位关联的所有乐团列表
 		List<String> musicGroupIds = musicGroupDao.findNormalByCooperationId(coopId);
-		if(CollectionUtils.isEmpty(musicGroupIds)){
-			return Collections.EMPTY_LIST;
-		}
-		//获取当前学期
-		Date date = new Date();
-		String startTerm = DateUtil.getStartTerm(date);
-		String endTerm = DateUtil.getEndTerm(date);
-		List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> summary =
-				courseScheduleDao.getSummaryOfCurrentSemesterCourses(musicGroupIds, startTerm, endTerm);
 		List<CourseSchedule.CourseScheduleType> courseTypeList = Arrays.asList(
 				CourseScheduleType.SINGLE,
 				CourseScheduleType.MIX,
@@ -5409,13 +5400,25 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				CourseScheduleType.COMPREHENSIVE,
 				CourseScheduleType.CLASSROOM
 		);
+		if(CollectionUtils.isEmpty(musicGroupIds)){
+			return this.initClassOfSummary(courseTypeList,null);
+		}
+		//获取当前学期
+		Date date = new Date();
+		String startTerm = DateUtil.getStartTerm(date);
+		String endTerm = DateUtil.getEndTerm(date);
+		List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> summary =
+				courseScheduleDao.getSummaryOfCurrentSemesterCourses(musicGroupIds, startTerm, endTerm);
 		return this.initClassOfSummary(courseTypeList,summary);
     }
 
 	private List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto>
 	initClassOfSummary(List<CourseSchedule.CourseScheduleType> courseTypeList,List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> summary){
 		Map<CourseScheduleType, DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto>
-				map = summary.stream().collect(Collectors.groupingBy(e -> e.getScheduleType(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
+				map = new HashMap<>();
+		if(CollectionUtils.isNotEmpty(summary)){
+			map = summary.stream().collect(Collectors.groupingBy(e -> e.getScheduleType(), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0))));
+		}
 		List<DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto> result = new ArrayList<>();
 		for (CourseScheduleType scheduleType : courseTypeList) {
 			DailySummaryOfClassesForTheCurrentSemesterWrapper.DailySummaryOfClassesForTheCurrentSemesterDetailDto dto = map.get(scheduleType);

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

@@ -3,6 +3,7 @@ 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.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.SchoolActivityDetail;
 import com.ym.mec.biz.dal.enums.ESchoolActivityStatus;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityDetailWrapper;
@@ -36,6 +37,8 @@ public class SchoolActivityServiceImpl extends ServiceImpl<SchoolActivityMapper,
     @Autowired
     private SchoolActivityDetailUserService schoolActivityDetailUserService;
 
+    @Autowired
+    private CooperationOrganService cooperationOrganService;
 
     @Autowired
     private SysUserService sysUserService;
@@ -61,6 +64,13 @@ public class SchoolActivityServiceImpl extends ServiceImpl<SchoolActivityMapper,
             schoolActivityInfo.setStatus(ESchoolActivityStatus.PROCESSING);
         }
 
+        // 设置机构信息
+        CooperationOrgan cooperationOrgan = cooperationOrganService.get(schoolActivity.getId());
+        if (cooperationOrgan != null) {
+            schoolActivityInfo.setCooperationOrganName(cooperationOrgan.getName());
+            schoolActivityInfo.setCooperationOrganLogo(cooperationOrgan.getLogo());
+        }
+
         // 设置节目信息
         List<SchoolActivityDetailWrapper.SchoolActivityDetail> schoolActivityDetails = schoolActivityDetailService.selectListByActivityId(id);