zouxuan 5 年之前
父节点
当前提交
5b6c448ebd

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

@@ -707,6 +707,7 @@
         <result property="vipGroupStatus" column="vip_group_status_"/>
         <result property="organName" column="organ_name_"/>
         <result property="subjectName" column="music_group_subject_"/>
+        <result property="courseBalance" column="balance_"/>
     </resultMap>
     <select id="queryHasCourseStudent" resultMap="studentManageListDto">
         SELECT su.id_ user_id_,su.username_,su.gender_,GROUP_CONCAT(DISTINCT sr.parents_name_)parents_name_,
@@ -726,7 +727,8 @@
         CASE WHEN GROUP_CONCAT(DISTINCT cssp.id_) IS NULL THEN 0 ELSE 1 END hasCourse_,
         CASE WHEN GROUP_CONCAT(DISTINCT pla.id_) IS NULL THEN 0 ELSE 1 END isMake_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
-        CASE WHEN GROUP_CONCAT(DISTINCT cssp1.id_) IS NULL THEN 0 ELSE 1 END hasPracticeCourse_
+        CASE WHEN GROUP_CONCAT(DISTINCT cssp1.id_) IS NULL THEN 0 ELSE 1 END hasPracticeCourse_,
+        suca.balance_
         FROM sys_user su
         LEFT JOIN course_schedule_student_payment cssp ON su.id_ = cssp.user_id_
         LEFT JOIN music_group mg ON cssp.music_group_id_ = mg.id_ AND cssp.group_type_ = 'MUSIC'
@@ -737,6 +739,7 @@
         LEFT JOIN practice_lesson_apply pla on pla.user_id_ = su.id_
         LEFT JOIN course_schedule_student_payment cssp1 ON su.id_ = cssp1.user_id_ AND cssp1.group_type_ = 'PRACTICE'
         LEFT JOIN class_group_student_mapper cgsm ON su.id_ = cgsm.user_id_ AND cgsm.group_type_ = 'VIP'
+        LEFT JOIN sys_user_cash_account suca ON su.id_ = suca.user_id_
         WHERE su.user_type_ LIKE '%STUDENT%'
         <if test="hasPracticeCourse != null and hasPracticeCourse == true">
             AND cssp1.id_ IS NOT NULL

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

@@ -254,10 +254,10 @@ public class ExportController extends BaseController {
 //        List<StudentManageListDto> rows = studentManageService.findStudentsByOrganId(queryInfo).getRows();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
-                    "家长联系电话", "是否激活", "是否有课", "是否预约陪练课","是否有陪练课",
+                    "家长联系电话", "是否激活", "是否有课", "是否预约陪练课","是否有陪练课", "课程余额(元)",
                     "所在乐团", "乐团所属声部", "所在乐团状态", "所在vip课", "所在VIP状态"}, new String[]{
                     "organName", "userId", "username", "gender.description", "parentsName", "parentsPhone",
-                    "isActive.msg","hasCourse.msg","isMake.msg","hasPracticeCourse.msg","musicGroupName",
+                    "isActive.msg","hasCourse.msg","isMake.msg","hasPracticeCourse.msg","courseBalance","musicGroupName",
                     "subjectName","musicGroupStatus","vipGroupName","vipGroupStatus"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");