Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/Student4operating.java

@@ -14,11 +14,13 @@ public class Student4operating {
     private Integer vipTimes;
     private Integer freePracticeTimes;
     private Integer buyPracticeTimes;
+    private Integer musicNetWorkTimes;
 
     private String operatingTagStr;
     private String vipTimesStr;
     private String freePracticeTimesStr;
     private String buyPracticeTimesStr;
+    private String musicNetWorkTimesStr;
     private Integer studentNum;
 
     public String getOrganName() {
@@ -145,4 +147,20 @@ public class Student4operating {
 	public void setStudentNum(Integer studentNum) {
 		this.studentNum = studentNum;
 	}
+
+    public Integer getMusicNetWorkTimes() {
+        return musicNetWorkTimes;
+    }
+
+    public void setMusicNetWorkTimes(Integer musicNetWorkTimes) {
+        this.musicNetWorkTimes = musicNetWorkTimes;
+    }
+
+    public String getMusicNetWorkTimesStr() {
+        return musicNetWorkTimesStr;
+    }
+
+    public void setMusicNetWorkTimesStr(String musicNetWorkTimesStr) {
+        this.musicNetWorkTimesStr = musicNetWorkTimesStr;
+    }
 }

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

@@ -123,7 +123,7 @@ public class TeacherDefaultMusicGroupSalaryServiceImpl extends BaseServiceImpl<L
 								BigDecimal duration = new BigDecimal(DateUtil.minutesBetween(ts.getCourseSchedule().getStartClassTime(), ts.getCourseSchedule()
 										.getEndClassTime()));
 								int mins = 0;
-								if(tdms.getCourseScheduleType() == CourseScheduleType.HIGH_ONLINE) {
+								if(tdms.getCourseScheduleType() == CourseScheduleType.HIGH_ONLINE || tdms.getCourseScheduleType() == CourseScheduleType.MUSIC_NETWORK) {
 									if (!classGroupStudentNumMap.containsKey(ts.getClassGroupId())) {
 										// 查询 班级人数
 										String[] strs = classGroupStudentMapperDao.findStudentNumByClassGroupId(ts.getClassGroupId());

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

@@ -222,6 +222,7 @@
         <result column="vip_times_" property="vipTimes"/>
         <result column="free_practice_times_" property="freePracticeTimes"/>
         <result column="buy_practice_times_" property="buyPracticeTimes"/>
+        <result column="music_netWork_times_" property="musicNetWorkTimes"/>
         <result column="student_num_" property="studentNum"/>
     </resultMap>
 
@@ -235,6 +236,7 @@
         s.operating_tag_,
         a.vip_times_,
         a.buy_practice_times_,
+        a.music_netWork_times_,
         p.free_practice_times_
         FROM student s
         LEFT JOIN sys_user su ON s.user_id_ = su.id_
@@ -243,7 +245,8 @@
         LEFT JOIN (
         SELECT cssp.user_id_,
         SUM(case when (cs.group_type_ = 'VIP' AND cs.teach_mode_='ONLINE') then 1 ELSE 0 END) vip_times_,
-        SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_
+        SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_,
+        SUM(case when (pg.type_='MUSIC_NETWORK') then 1 ELSE 0 END) music_netWork_times_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
@@ -268,7 +271,8 @@
         LEFT JOIN (
         SELECT cssp.user_id_,
         SUM(case when (cs.group_type_ = 'VIP' AND cs.teach_mode_='ONLINE') then 1 ELSE 0 END) vip_times_,
-        SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_
+        SUM(case when (pg.type_='CHARGE') then 1 ELSE 0 END) buy_practice_times_,
+        SUM(case when (pg.type_='MUSIC_NETWORK') then 1 ELSE 0 END) music_netWork_times_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
@@ -318,6 +322,12 @@
             <if test='hasBuyPractice != null and hasBuyPractice=="0"'>
                 AND (a.buy_practice_times_ =0 OR a.buy_practice_times_ IS NULL)
             </if>
+            <if test='hasMusicNetWork != null and hasMusicNetWork=="1"'>
+                AND a.music_netWork_times_ >=1
+            </if>
+            <if test='hasMusicNetWork != null and hasMusicNetWork=="0"'>
+                AND (a.music_netWork_times_ =0 OR a.music_netWork_times_ IS NULL)
+            </if>
         </where>
     </sql>
 

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

@@ -1410,6 +1410,11 @@ public class ExportController extends BaseController {
             }else {
                 row.setVipTimesStr("否");
             }
+            if(row.getMusicNetWorkTimes() != null && row.getMusicNetWorkTimes() >0){
+                row.setMusicNetWorkTimesStr("是");
+            }else {
+                row.setMusicNetWorkTimesStr("否");
+            }
             if(row.getFreePracticeTimes() != null && row.getFreePracticeTimes() >0){
                 row.setFreePracticeTimesStr("是");
             }else {
@@ -1425,8 +1430,8 @@ public class ExportController extends BaseController {
         try {
 
             HSSFWorkbook workbook = POIUtil.exportExcel(
-                    new String[]{"分部", "学生", "学生编号", "指导老师","指导老师id", "参与运营指标", "有线上VIP课", "参与免费网管课", "有付费网管课"},
-                    new String[]{"organName", "studentName", "studentId", "teacherName","teacherId", "operatingTagStr", "vipTimesStr", "freePracticeTimesStr", "buyPracticeTimesStr"}, rows);
+                    new String[]{"分部", "学生", "学生编号", "指导老师","指导老师id", "参与运营指标", "有线上VIP课", "参与免费网管课", "有付费网管课","有乐团网管课"},
+                    new String[]{"organName", "studentName", "studentId", "teacherName","teacherId", "operatingTagStr", "vipTimesStr", "freePracticeTimesStr", "buyPracticeTimesStr","musicNetWorkTimes"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             ouputStream = response.getOutputStream();