学员列表增加，vip ，网管课剩余课时

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

@@ -1,13 +1,19 @@
 package com.ym.mec.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class StudentListCourseDto {
 
 	private Integer userId;
 	
 	private Integer remainCourseNum;
-	
+
+	@ApiModelProperty(value = "剩余网管课数")
 	private Integer remainPracticeNum;
 
+	@ApiModelProperty(value = "剩余Vip课数")
+	private Integer remainVipNum;
+
 	public Integer getUserId() {
 		return userId;
 	}
@@ -31,5 +37,12 @@ public class StudentListCourseDto {
 	public void setRemainPracticeNum(Integer remainPracticeNum) {
 		this.remainPracticeNum = remainPracticeNum;
 	}
-	
+
+	public Integer getRemainVipNum() {
+		return remainVipNum;
+	}
+
+	public void setRemainVipNum(Integer remainVipNum) {
+		this.remainVipNum = remainVipNum;
+	}
 }

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

@@ -98,6 +98,12 @@ public class StudentManageListDto {
     @ApiModelProperty(value = "0 - 6+3年制    1 - 5+4年制")
     private GradeTypeEnum gradeType;
 
+    @ApiModelProperty(value = "剩余VIP课数")
+    private Integer noStartVipCourseNum = 0;
+
+    @ApiModelProperty(value = "剩余网管课数")
+    private Integer noStartPracticeCourseNum = 0;
+
     public String getContractVersions() {
         return contractVersions;
     }
@@ -369,4 +375,20 @@ public class StudentManageListDto {
     public void setGradeType(GradeTypeEnum gradeType) {
         this.gradeType = gradeType;
     }
+
+    public Integer getNoStartVipCourseNum() {
+        return noStartVipCourseNum;
+    }
+
+    public void setNoStartVipCourseNum(Integer noStartVipCourseNum) {
+        this.noStartVipCourseNum = noStartVipCourseNum;
+    }
+
+    public Integer getNoStartPracticeCourseNum() {
+        return noStartPracticeCourseNum;
+    }
+
+    public void setNoStartPracticeCourseNum(Integer noStartPracticeCourseNum) {
+        this.noStartPracticeCourseNum = noStartPracticeCourseNum;
+    }
 }

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

@@ -161,9 +161,13 @@ public class StudentManageServiceImpl implements StudentManageService {
                 }
                 if (studentListCourseDto.getRemainPracticeNum() > 0) {
                     dto.setHasPracticeCourse(YesOrNoEnum.YES);
+                    dto.setNoStartPracticeCourseNum(studentListCourseDto.getRemainPracticeNum());
                 } else {
                     dto.setHasPracticeCourse(YesOrNoEnum.NO);
                 }
+                if (studentListCourseDto.getRemainPracticeNum() > 0) {
+                    dto.setNoStartVipCourseNum(studentListCourseDto.getRemainVipNum());
+                }
             } else {
                 dto.setHasCourse(YesOrNoEnum.NO);
                 dto.setHasPracticeCourse(YesOrNoEnum.NO);

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

@@ -32,6 +32,7 @@
         <result property="userId" column="userId"/>
         <result property="remainCourseNum" column="remainCourseNum"/>
         <result property="remainPracticeNum" column="remainPracticeNum"/>
+        <result property="remainVipNum" column="remainVipNum"/>
     </resultMap>
     
     <resultMap id="studentManageListDto" type="com.ym.mec.biz.dal.dto.StudentManageListDto">
@@ -854,8 +855,9 @@
     </select>
     
     <select id="queryStudentRemianCourse" resultMap="StudentListCourseDto">
-    	SELECT cssp.`user_id_` userId,count(cssp.`id_`) remainCourseNum,sum(case when cs.`group_type_` = 'PRACTICE' then 1 else 0 end) remainPracticeNum  
-    	FROM `course_schedule_student_payment` cssp LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
+    	SELECT cssp.`user_id_` userId,count(cssp.`id_`) remainCourseNum,sum(case when cs.`group_type_` = 'PRACTICE' then 1 else 0 end) remainPracticeNum,
+        sum(case when cs.`group_type_` = 'VIP' then 1 else 0 end) remainVipNum
+        FROM `course_schedule_student_payment` cssp LEFT JOIN `course_schedule` cs on cssp.`course_schedule_id_` = cs.`id_`
 		WHERE cs.`status_` = 'NOT_START' AND cssp.`user_id_` IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
             #{userId}

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

@@ -718,10 +718,10 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
-                    "家长联系电话", "是否激活", "是否有课", "是否有网管课", "课程余额(元)", "账户余额(元)",
+                    "家长联系电话", "是否激活", "是否有课", "是否有网管课","网管课剩余课时","VIP课剩余课时", "课程余额(元)", "账户余额(元)",
                     "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态", "服务标签", "运营标签", "指导老师", "是否签订协议"}, new String[]{
                     "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone",
-                    "isActive.msg", "hasCourse.msg", "hasPracticeCourse.msg", "courseBalance", "balance", "musicGroupName",
+                    "isActive.msg", "hasCourse.msg", "hasPracticeCourse.msg","noStartPracticeCourseNum","noStartVipCourseNum", "courseBalance", "balance", "musicGroupName",
                     "subjectName", "musicGroupStatus", "vipGroupName", "vipGroupStatus", "serviceTag.msg", "operatingTag.msg", "teacherName", "isSignedContract ? '是' : '否'"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");