查询学生列表

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ExtraExercilseReplyQueryInfo.java

@@ -46,7 +46,17 @@ public class ExtraExercilseReplyQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "是否云教练作业")
 	private Boolean cloudHomeworkFlag;
 
-	public Boolean getCloudHomeworkFlag() {
+    private String versionTag;
+
+    public String getVersionTag() {
+        return versionTag;
+    }
+
+    public void setVersionTag(String versionTag) {
+        this.versionTag = versionTag;
+    }
+
+    public Boolean getCloudHomeworkFlag() {
 		return cloudHomeworkFlag;
 	}
 

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

@@ -830,7 +830,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                 }
 
                 // 如果是给学生布置的作业  名 ： xx等多少名学员
-                if (StringUtils.isEmpty(courseHomeworkList.getMusicGroupId()) && courseHomeworkList.getClassGroupId() == null) {
+                if (courseHomeworkList.getClassGroupId() == null) {
                     String studentIdList = courseHomeworkList.getStudentIdList();
                     if (StringUtils.isNotBlank(studentIdList)) {
 

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

@@ -346,6 +346,9 @@
 			<if test="existVipCourse!=null and existVipCourse==0">
 				AND NOT EXISTS (SELECT cssp.id_ FROM course_schedule_student_payment cssp LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_ WHERE cssp.user_id_=eer.user_id_ AND cssp.group_type_='VIP' AND CONCAT(cs.class_date_," ",cs.start_class_time_) &gt; NOW())
 			</if>
+            <if test="versionTag != null and versionTag != ''">
+                and ee.version_tag_ = #{versionTag}
+            </if>
 		</where>
 	</sql>
 

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

@@ -221,7 +221,7 @@
         LEFT JOIN sys_user u ON igm.user_id_ = u.id_
         LEFT JOIN student st ON st.user_id_ = u.id_
         LEFT JOIN `subject` s ON s.id_ = st.subject_id_list_
-        WHERE igm.im_group_id_ = #{imGroupId}
+        WHERE igm.im_group_id_ = #{imGroupId} and st.user_id_ is not null
         <if test="search != null">
             and (u.real_name_ like concat('%',#{search},'%'))
         </if>

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

@@ -133,12 +133,13 @@
 	</select>
 
 	<select id="queryFriendListByUserIdV2" resultMap="ImUserFriendDto">
-        SELECT iuf.*,u.real_name_,u.avatar_,u.phone_,u.user_type_,st.member_rank_setting_id_,s.name_ subject_name_,st.subject_id_list_ subject_id_
+        SELECT distinct iuf.*,u.real_name_,u.avatar_,u.phone_,u.user_type_,st.member_rank_setting_id_,s.name_ subject_name_,st.subject_id_list_ subject_id_
         FROM im_user_friend iuf
         LEFT JOIN sys_user u ON iuf.friend_id_ = u.id_
         LEFT JOIN student st ON st.user_id_ = u.id_
+        left join class_group_student_mapper cgs on cgs.user_id_ = st.user_id_
         LEFT JOIN `subject` s ON s.id_ = st.subject_id_list_
-        WHERE iuf.user_id_ = #{userId}
+        WHERE iuf.user_id_ = #{userId} and st.user_id_ is not null
         <if test="search != null">
             and (u.real_name_ like concat('%',#{search},'%') or iuf.friend_nickname_ like concat('%',#{search},'%'))
         </if>
@@ -146,7 +147,7 @@
             and st.subject_id_list_ = #{subjectId}
         </if>
         <if test="musicGroupId != null and musicGroupId != ''">
-            and st.music_group_id_ = #{musicGroupId}
+            and cgs.music_group_id_ = #{musicGroupId}
         </if>
         <if test="vipFlag != null">
             <if test="vipFlag">

mec-web/src/main/java/com/ym/mec/web/controller/ExtracurricularExercisesReplyController.java

@@ -26,6 +26,8 @@ public class ExtracurricularExercisesReplyController extends BaseController {
     @GetMapping("/queryPageList")
     private HttpResponseResult findExtraExercilses(ExtraExercilseReplyQueryInfo queryInfo){
         queryInfo.setOrganIdList(organizationService.getEmployeeOrgan(queryInfo.getOrganIdList()));
+        // 只看历史v1版本记录
+        queryInfo.setVersionTag("v1");
         return succeed(extracurricularExercisesReplyService.findExtraExercises(queryInfo));
     }
 }