乐团ID

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SchoolActivityDetail.java

@@ -44,7 +44,7 @@ public class SchoolActivityDetail implements Serializable {
 
     @ApiModelProperty("乐团ID") 
 	@TableField(value = "music_group_id_")
-    private Integer musicGroupId;
+    private String musicGroupId;
 
     @ApiModelProperty("声部ID集合") 
 	@TableField(value = "subject_id_list_")

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

@@ -1,29 +1,24 @@
 package com.ym.mec.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.core.conditions.update.Update;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.config.validator.group.ValidGroups;
 import com.ym.mec.biz.dal.enums.ESchoolActivityStatus;
 import com.ym.mec.biz.dal.enums.ESchoolActivityType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.validation.annotation.Validated;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * 学校活动
@@ -55,7 +50,7 @@ public class SchoolActivityWrapper {
         private Integer studentId;
 
         @ApiModelProperty("乐团ID")
-        private Long musicGroupId;
+        private String musicGroupId;
 
         @ApiModelProperty("开始时间")
         private Date startTime;
@@ -157,7 +152,7 @@ public class SchoolActivityWrapper {
     public static class SchoolActivityStudentQuery {
 
         @ApiModelProperty("乐团ID")
-        private Long musicGroupId;
+        private String musicGroupId;
 
         @ApiModelProperty("声部ID集合")
         private List<Integer> subjectIds;

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

@@ -32,7 +32,7 @@ public class StudentWrapper {
         private String keyword;
 
         @ApiModelProperty("乐团ID")
-        private Long musicGroupId;
+        private String musicGroupId;
 
         @ApiModelProperty("声部ID")
         private Integer subjectId;
@@ -59,10 +59,10 @@ public class StudentWrapper {
 
 
         @ApiModelProperty("乐团ID")
-        private Long musicGroupId;
+        private String musicGroupId;
 
         @ApiModelProperty("乐团ID集合")
-        private List<Long> musicGroupIds;
+        private List<String> musicGroupIds;
 
         @ApiModelProperty("学生ID集合")
         private List<Integer> studentIds;
@@ -212,7 +212,7 @@ public class StudentWrapper {
 
         @NotNull(message = "乐团ID不能为空")
         @ApiModelProperty(value = "乐团ID")
-        private Long musicGroupId;
+        private String musicGroupId;
 
         @ApiModelProperty(value = "合作机构ID")
         private Integer cooperationOrganId;

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

@@ -28,7 +28,7 @@ public class TeachingPointWrapper {
         private Integer cooperationOrganId;
 
         @ApiModelProperty("乐团ID")
-        private Long musicGroupId;
+        private String musicGroupId;
 
 
         @ApiModelProperty("开始时间")
@@ -70,7 +70,7 @@ public class TeachingPointWrapper {
         private CourseStatusEnum courseStatus;
 
         @ApiModelProperty("乐团ID")
-        private Long musicGroupId;
+        private String musicGroupId;
 
         @ApiModelProperty("乐团名")
         private String musicGroupName;
@@ -107,7 +107,7 @@ public class TeachingPointWrapper {
         private String classGroupName;
 
         @ApiModelProperty("乐团ID")
-        private Long musicGroupId;
+        private String musicGroupId;
 
         @ApiModelProperty("乐团名")
         private String musicGroupName;

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

@@ -1331,11 +1331,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         }
 
         // 乐团ID集合
-        List<Long> musicGroupIds = studentLists.stream()
+        List<String> musicGroupIds = studentLists.stream()
                 .map(o -> o.getMusicGroupIds())
                 .flatMap(o -> Arrays.stream(o.split(",")))
                 .filter(Objects::nonNull)
-                .map(Long::parseLong)
                 .collect(Collectors.toList());
 
         // 设置学生姓名/头像

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

@@ -23,7 +23,7 @@
             <if test="param.endTime != null">
                 and cs.class_date_ &lt;= date_format(#{param.endTime}, '%Y-%m-%d')
             </if>
-            <if test="param.musicGroupId != null">
+            <if test="param.musicGroupId != null and param.musicGroupId != ''">
                 and cs.music_group_id_ = #{param.musicGroupId}
             </if>
         </where>
@@ -42,7 +42,7 @@
         left join music_group mg on mg.id_ = cg.music_group_id_
         <where>
             and cg.del_flag_ = 0 and mg.del_flag_ = 0
-            <if test="param.musicGroupId != null" >
+            <if test="param.musicGroupId != null and param.musicGroupId != ''">
                 and cg.music_group_id_ = #{param.musicGroupId}
             </if>
             <if test="param.cooperationOrganId != null">

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

@@ -25,7 +25,7 @@
             <if test="param.studentId != null">
                 and t2.student_id_ = #{param.studentId}
             </if>
-            <if test="param.musicGroupId != null">
+            <if test="param.musicGroupId != null and param.musicGroupId != ''">
                 and t1.music_group_id_ = #{param.musicGroupId}
             </if>
             <if test="param.startTime != null">
@@ -47,7 +47,7 @@
         left join student_registration sr on sr.user_id_ = s.user_id_
 
         <where>
-            <if test="param.musicGroupId != null">
+            <if test="param.musicGroupId != null and param.musicGroupId != ''">
                 and sr.music_group_id_ = #{param.musicGroupId}
                 and sr.music_group_status_ = 'NORMAL'
             </if>

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

@@ -21,7 +21,7 @@
             <if test="param.keyword != null and param.keyword != ''">
                 and (su.username_ like concat('%', #{param.keyword}, '%'))
             </if>
-            <if test="param.musicGroupId != null">
+            <if test="param.musicGroupId != null and param.musicGroupId != ''">
                 and sr.music_group_id_ = #{param.musicGroupId}
             </if>
             <if test="param.subjectId != null">