管乐迷需求一大堆

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

@@ -454,12 +454,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             params.put("offset", pageInfo.getOffset());
             dataList = degreeRegistrationDao.queryPage(params);
             DegreeRegistration degree = degreeRegistrationDao.getTotalAmount(params);
-//            BigDecimal totalAmount = degree.getMoney() == null ? BigDecimal.ZERO : degree.getMoney();
-//            BigDecimal theoryLevelAmount = degree.getTheoryMoney() == null ? BigDecimal.ZERO : degree.getTheoryMoney();
-//            BigDecimal totalAmount = subjectLevelAmount.add(theoryLevelAmount);
             pageInfo.setApplyNum(degreeRegistrationDao.countApplyNum(params));
-//            pageInfo.setSubjectLevelAmount(subjectLevelAmount);
-//            pageInfo.setTheoryLevelAmount(theoryLevelAmount);
             pageInfo.setTotalAmount(degree.getMoney());
         }
         pageInfo.setRows(dataList);

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

@@ -519,19 +519,22 @@
 		<if test="groupType == 'VIP'">
 			select count(distinct cssp.user_id_) from vip_group vg
 			left join course_schedule_student_payment cssp ON cssp.music_group_id_ = vg.id_
+			left join sys_user su ON su.id_ = cssp.user_id_
 			where cssp.group_type_ = 'VIP' and vg.group_status_ = 2 AND vg.vip_group_category_id_ != 16
 		</if>
 		<if test="groupType == 'THEORY'">
 			select count(distinct cssp.user_id_) from vip_group vg
 			left join course_schedule_student_payment cssp ON cssp.music_group_id_ = vg.id_
+			left join sys_user su ON su.id_ = cssp.user_id_
 			where cssp.group_type_ = 'VIP' and vg.group_status_ = 2 AND vg.vip_group_category_id_ = 16
 		</if>
 		<if test="groupType == 'PRACTICE'">
 			select count(distinct cssp.user_id_) from practice_group vg
 			left join course_schedule_student_payment cssp ON cssp.music_group_id_ = vg.id_
+			left join sys_user su ON su.id_ = cssp.user_id_
 			where cssp.group_type_ = 'PRACTICE' and vg.group_status_ = 'NORMAL'
 		</if>
-		AND vg.organ_id_ IN
+		AND su.organ_id_ IN
 		<foreach collection="organIdList" item="organId" open="(" close=")" separator=",">
 			#{organId}
 		</foreach>
@@ -631,7 +634,7 @@
 		from student_statistics ss
 		left join (select cssp.user_id_,COUNT(distinct cssp.course_schedule_id_) consumerNum from course_schedule cs
 		left join course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
-		where DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.status_ = 'OVER' AND cs.type_ = 'VIP'
+		where DATE_FORMAT(cs.class_date_,'%Y-%m') = #{month} AND cs.type_ = 'VIP'
 		<include refid="com.ym.mec.biz.dal.dao.CourseScheduleDao.courseIgnore"/>
 		group by cssp.user_id_) cs ON cs.user_id_ = ss.user_id_
 		left join sys_user su ON su.id_ = ss.user_id_