管乐迷评测记录详情

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

@@ -288,12 +288,12 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     List<Map<String, Integer>> countNormalNum(String musicGroupIds);
 
     /**
-     * 获取乐团在读人数
+     * 获取乐团在读学员列表
      *
      * @param musicGroupId
      * @return
      */
-    List<Integer> queryNormalUserList(String musicGroupId);
+    List<Integer> queryNormalUserList(@Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取学员基本信息
@@ -771,4 +771,8 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
     void updateCourseFee(@Param("id") Long id, @Param("musicalFee") BigDecimal musicalFee);
 
     void batchUpdate(@Param("studentRegistrations") List<StudentRegistration> studentRegistrations);
+
+    //获取乐团在读学员列表
+    List<Integer> findNormalStu(@Param("musicGroupId") String musicGroupId, @Param("classGroupId") Integer classGroupId);
+
 }

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

@@ -34,10 +34,13 @@ public class SysMusicCompareRecordQueryInfo extends QueryInfo {
     private Boolean memberFlag;
 
     @ApiModelProperty("是否乐团学员(进行中乐团在读学员)")
-    private Boolean musicFlag;
+    private Boolean musicFlag = false;
 
-    @ApiModelProperty("是否小课学员(有排过VIP、网管课的学员)")
-    private Boolean vipFlag;
+    @ApiModelProperty("是否有已结束的小课（没有未开始）")
+    private Boolean hasEndVipFlag = false;
+
+    @ApiModelProperty("是否有未开始的小课")
+    private Boolean hasNotStartVipFlag = false;
 
     @ApiModelProperty("排序字段：TRAINDAYS(训练天数);TRAINTIME(训练时长);TRAINNUM(训练次数)")
     private String sortField = "TRAINDAYS";

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

@@ -54,6 +54,8 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	@Autowired
 	private StudentDao studentDao;
 	@Autowired
+	private StudentRegistrationDao studentRegistrationDao;
+	@Autowired
 	private StudentVisitDao studentVisitDao;
 	@Autowired
 	private SysMessageService sysMessageService;
@@ -471,6 +473,22 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		if(CollectionUtils.isEmpty(studentIdList)){
 			return pageInfo;
 		}
+		//是否乐团在读学员
+		if(queryInfo.getMusicFlag()){
+//			studentRegistrationDao.
+		}
+		if(StringUtils.isNotEmpty(queryInfo.getMusicGroupId())){
+			//获取乐团下的学员列表
+			List<Integer> studentIds = studentRegistrationDao.findNormalStu(queryInfo.getMusicGroupId(), queryInfo.getClassGroupId());
+			if(CollectionUtils.isEmpty(studentIds)){
+				return pageInfo;
+			}
+			//取交集
+			studentIdList.retainAll(studentIds);
+			if(CollectionUtils.isEmpty(studentIdList)){
+				return pageInfo;
+			}
+		}
 		if (queryInfo.getMemberFlag() != null){
 			//筛选vip学员
 			studentIdList = studentDao.queryMemberStudent(queryInfo.getMemberFlag(),studentIdList);

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

@@ -884,7 +884,7 @@
         SELECT sr.user_id_
         FROM student_registration sr
         WHERE sr.music_group_status_ = 'NORMAL'
-        AND sr.music_group_id_ = #{musicGroupIds}
+        AND sr.music_group_id_ = #{musicGroupId}
     </select>
     <select id="queryUserByPhone" resultMap="StudentRegistration">
         SELECT su.id_,
@@ -1956,4 +1956,12 @@
         where sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS' AND sr.user_id_ = #{userId}
         group by mg.educational_teacher_id_
     </select>
+    <select id="findNormalStu" resultType="java.lang.Integer">
+        select DISTINCT sr.user_id_ from student_registration sr
+        left join class_group_student_mapper cgsm ON cgsm.music_group_id_ = sr.music_group_id_
+        where sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ = 'NORMAL'
+        <if test="classGroupId != null">
+            AND cgsm.status_ = 'NORMAL' AND cgsm.class_group_id_ = #{classGroupId}
+        </if>
+    </select>
 </mapper>