Merge branch 'zouxuan_saas_2022_0606' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -512,4 +512,6 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     //乐团统计数据导出
     List<MusicGroupExportDto> exportMusicGroupCourseList(@Param("queryInfo") ExportUserAccountQueryInfo queryInfo);
+    //查询
+    List<MusicGroupBasicDto> findMusicByCourseIds(@Param("courseIds") List<Long> courseIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleEndDto.java

@@ -54,6 +54,8 @@ public class CourseScheduleEndDto extends CourseSchedule {
 
     /** 处理时间 */
     private java.util.Date dealTime;
+    /** 合作单位 */
+    private String cooperationOrgan;
 
     public Date getGenerateTime() {
         return generateTime;
@@ -214,4 +216,12 @@ public class CourseScheduleEndDto extends CourseSchedule {
 	public void setIsComplaints(String isComplaints) {
 		this.isComplaints = isComplaints;
 	}
+
+    public String getCooperationOrgan() {
+        return cooperationOrgan;
+    }
+
+    public void setCooperationOrgan(String cooperationOrgan) {
+        this.cooperationOrgan = cooperationOrgan;
+    }
 }

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

@@ -2859,9 +2859,9 @@ public class ExportServiceImpl implements ExportService {
         }
         HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "乐团主管", "课程编号", "开始时间", "结束时间",
                 "班级名称", "班级声部", "课程名称", "课程类型", "教学模式",
-                "教学点", "课程状态", "指导老师", "学员编号", "是否点名", "是否有考勤申诉", "预计上课人数"}, new String[]{
+                "教学点", "课程状态", "指导老师", "学员编号", "是否点名", "是否有考勤申诉", "预计上课人数","合作单位"}, new String[]{
                 "organName", "educationTeacherName", "id", "startClassTime", "endClassTime", "classGroupName", "subjectName", "name",
-                "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName", "studentId", "isCallNames.msg", "isComplaints", "studentNum"}, rows);
+                "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName", "studentId", "isCallNames.msg", "isComplaints", "studentNum","cooperationOrgan"}, rows);
         exportManagerDownload(workbook,managerDownload);
     }
 

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

@@ -107,8 +107,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 	@Transactional(rollbackFor = Exception.class)
 	public String createGroup(ImGroupDto imGroupDto){
 		List<String> userIdList = imGroupDto.getUserIdList();
+		Integer currentUserId = null;
 		if (CollectionUtils.isEmpty(userIdList)){
-			Integer currentUserId = sysUserFeignService.queryUserInfo().getId();
+			currentUserId = sysUserFeignService.queryUserInfo().getId();
 			userIdList.add(currentUserId.toString());
 		}
 		String groupName = imGroupDto.getGroupName();
@@ -121,6 +122,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 		imGroup.setId(groupId);
 		imGroup.setCreateTime(date);
 		imGroup.setIntroduce(groupName);
+		imGroup.setMemo(groupName);
 		imGroup.setMemberNum(userIdList.size());
 		imGroup.setName(groupName);
 		imGroup.setType(type);
@@ -128,6 +130,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 		imGroup.setUpdateTime(date);
 		imGroupDao.insert(imGroup);
 		List<ImGroupMember> groupMemberList = imGroupMemberDao.queryMembers(groupId, userIdList, TenantContextHolder.getTenantId());
+		if(currentUserId != null){
+			groupMemberList.get(0).setRoleType("乐团主管");
+		}
 		imGroupMemberDao.batchInsert(groupMemberList);
         Function<String,GroupMember> newGroup = userId ->new GroupMember(userId, groupId);
 		List<GroupMember> groupMembers =  userIdList.stream().map(newGroup).collect(Collectors.toList());

mec-biz/src/main/resources/config/mybatis/ImGroupMapper.xml

@@ -119,7 +119,7 @@
 				AND igm.user_id_ = #{userId}
 			</if>
 			<if test="search != null and search != ''">
-				AND (ig.name_ like concat('%',#{search},'%') or ig.tags_ like concat('%',#{search},'%'))
+				AND (ig.name_ like concat('%',#{search},'%') or ig.memo_ like concat('%',#{search},'%'))
 			</if>
 			<if test="ignoreIds != null and ignoreIds != ''">
 				AND NOT FIND_IN_SET(ig.id_,#{ignoreIds})

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -1153,4 +1153,17 @@
             </if>
         </where>
     </select>
+
+    <select id="findMusicByCourseIds" resultMap="MusicGroupBasicDto">
+        select
+               t.id_,b.organ_id_ as cooperation_organ_id_,b.name_ as cooperation_organ_name_
+        from course_schedule t
+        left join music_group a on t.music_group_id_ = a.id_
+        left join cooperation_organ b on a.cooperation_organ_id_ = b.id_
+        where t.group_type_ = 'MUSIC'
+        and t.id_ IN
+        <foreach collection="courseIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
 </mapper>