问题一大堆

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

@@ -74,7 +74,7 @@ public class CourseScheduleModifyLogServiceImpl extends BaseServiceImpl<Integer,
 				records.stream().forEach(o -> usersMap.put(o.getUserId().intValue(), o.getUserId().toString()));
 
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_SCHOOL_COURSE_CHANGE,
-						usersMap, null, 0, null,
+						usersMap, null, 0, "{\"pageTag\":\"courseTable\",\"action\":\"app\",\"url\":\"\"}",
 						"SCHOOL",musicGroup.getName(),courseSchedule.getType().getMsg());
 			}
 		}
@@ -114,7 +114,7 @@ public class CourseScheduleModifyLogServiceImpl extends BaseServiceImpl<Integer,
 				records.stream().forEach(o -> usersMap.put(o.getUserId().intValue(), o.getUserId().toString()));
 
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_SCHOOL_COURSE_CREATE,
-						usersMap, null, 0, null,
+						usersMap, null, 0, "{\"pageTag\":\"courseTable\",\"action\":\"app\",\"url\":\"\"}",
 						"SCHOOL",musicGroup.getName(),courseSchedule.getType().getMsg());
 			}
 		}

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

@@ -211,12 +211,7 @@
         AND music_group_id_ = #{musicGroupId} AND status_ = 'PROCESSING'
         GROUP BY user_id_
     </select>
-    <select id="queryPageBySchool" resultType="com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto">
-        select mgq.user_id_ studentId,mgq.create_time_ createTime,mgq.school_staff_audit_status_ status,
-               sr.actual_subject_id_ subjectId,mgq.id_ musicGroupQuitId,su.username_ studentName,su.avatar_ studentAvatar
-        from music_group_quit mgq
-        left join student_registration sr ON sr.music_group_id_ = mgq.music_group_id_ AND sr.user_id_ = mgq.user_id_
-        left join sys_user su ON su.id_ = sr.user_id_
+    <sql id="queryPageBySchoolSql">
         <where>
             <if test="musicGroupIds != null">
                 AND mgq.music_group_id_ IN
@@ -230,27 +225,26 @@
             <if test="status == null">
                 AND mgq.school_staff_audit_status_ IN ('PASS','REJECT')
             </if>
+            <if test="search != null and search != ''">
+                AND (su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_ = #{search})
+            </if>
         </where>
+    </sql>
+    <select id="queryPageBySchool" resultType="com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto">
+        select mgq.user_id_ studentId,mgq.create_time_ createTime,mgq.school_staff_audit_status_ status,
+               sr.actual_subject_id_ subjectId,mgq.id_ musicGroupQuitId,su.username_ studentName,su.avatar_ studentAvatar
+        from music_group_quit mgq
+        left join student_registration sr ON sr.music_group_id_ = mgq.music_group_id_ AND sr.user_id_ = mgq.user_id_
+        left join sys_user su ON su.id_ = mgq.user_id_
+        <include refid="queryPageBySchoolSql"/>
         ORDER BY mgq.id_ DESC
         <include refid="global.limit"/>
     </select>
     <select id="countBySchool" resultType="java.lang.Integer">
         select COUNT(mgq.id_)
         from music_group_quit mgq
-        <where>
-            <if test="musicGroupIds != null">
-                AND mgq.music_group_id_ IN
-                <foreach collection="musicGroupIds" item="groupId" open="(" close=")" separator=",">
-                    #{groupId}
-                </foreach>
-            </if>
-            <if test="status != null">
-                AND mgq.school_staff_audit_status_ = #{status}
-            </if>
-            <if test="status == null">
-                AND mgq.school_staff_audit_status_ IN ('PASS','REJECT')
-            </if>
-        </where>
+        left join sys_user su ON su.id_ = mgq.user_id_
+        <include refid="queryPageBySchoolSql"/>
     </select>
     <select id="countRedPointBySchool" resultType="java.lang.Boolean">
         select COUNT(0) from music_group_quit mgq WHERE mgq.school_staff_audit_status_ = 'ING'

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

@@ -61,9 +61,6 @@ public class SchoolMusicGroupQuitController extends BaseController {
             musicGroupQuit.setReasonEnum(reasonEnum);
             musicGroupQuit.setStatus(ApprovalStatus.PROCESSING);
             musicGroupQuit.setOperatorId(operatorId);
-            musicGroupQuit.setSchoolStaffAuditStatus(EQuitGroupAuditStatusEnum.PASS);
-            musicGroupQuit.setSchoolStaffAuditReason(reason);
-            musicGroupQuit.setAuditSchoolStaff(operatorId);
             musicGroupQuits.add(musicGroupQuit);
         }
         musicGroupService.batchQuitMusicGroup(musicGroupQuits);