Merge remote-tracking branch 'origin/master'

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

@@ -32,10 +32,20 @@ public class StudentManageQueryInfo extends QueryInfo {
 
     private Boolean isMake;
 
+    private Boolean isExport;
+
     private Boolean hasCourse;
 
     private Boolean hasPracticeCourse;
 
+    public Boolean getIsExport() {
+        return isExport;
+    }
+
+    public void setIsExport(Boolean export) {
+        isExport = export;
+    }
+
     public Boolean getHasPracticeCourse() {
         return hasPracticeCourse;
     }

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

@@ -99,18 +99,21 @@ public class StudentManageServiceImpl implements StudentManageService {
         }else {
             count = studentManageDao.countStudentByOrganId(params);
         }
+        if(queryInfo.getIsExport() && count > 50000){
+            throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
+        }
         List<StudentManageListDto> dataList = null;
         if (count > 0) {
             pageInfo.setTotal(count);
             dataList = studentManageDao.findStudentsByOrganId(params);
             Set<Integer> userIds = dataList.stream().map(StudentManageListDto::getUserId).collect(Collectors.toSet());
-//            Set<Integer> organIds = dataList.stream().map(StudentManageListDto::getOrganId).collect(Collectors.toSet());
+            Set<Integer> organIds = dataList.stream().map(StudentManageListDto::getOrganId).collect(Collectors.toSet());
             List<SysUserCashAccount> byUserIds = sysUserCashAccountDao.findByUserIds(userIds);
             Map<Integer, SysUserCashAccount> collect = byUserIds.stream()
                     .collect(Collectors.toMap(SysUserCashAccount::getUserId, sysUserCashAccount -> sysUserCashAccount));
             Map<Integer,Integer> hasPracticeCourseMap = MapUtil.convertIntegerMap(studentManageDao.getHasPracticeCourse(userIds));
             //获取用户分部
-            /*Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
+            Map<Integer,String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMapList(organIds));
             //获取所在乐团
             Map<Integer,String> musicGroupNames = MapUtil.convertMybatisMap(musicGroupDao.queryUserMusicNames(userIds));
             //获取所在vip
@@ -120,9 +123,9 @@ public class StudentManageServiceImpl implements StudentManageService {
             //获取所在vip状态
             Map<Integer,String> vipGroupStatus = MapUtil.convertMybatisMap(vipGroupDao.queryUserVipStatus(userIds));
             //获取所在声部
-            Map<Integer,String> subjectNames = MapUtil.convertMybatisMap(studentManageDao.querySubjectNames(userIds));*/
+            Map<Integer,String> subjectNames = MapUtil.convertMybatisMap(studentManageDao.querySubjectNames(userIds));
             dataList.forEach(e -> {
-                /*e.setOrganName(organNames.get(e.getOrganId()));
+                e.setOrganName(organNames.get(e.getOrganId()));
                 e.setMusicGroupName(musicGroupNames.get(e.getUserId()));
                 e.setVipGroupName(vipGroupNames.get(e.getUserId()));
                 e.setSubjectName(subjectNames.get(e.getUserId()));
@@ -139,7 +142,7 @@ public class StudentManageServiceImpl implements StudentManageService {
                     for (int i = 0;i < split.length;i++){
                         e.setVipGroupStatus(ClassGroupStudentStatusEnum.valueOf(split[i]).getMsg()+" ");
                     }
-                }*/
+                }
                 if(hasCourse == null){
                     Integer course = studentManageDao.getHasCourse(e.getUserId());
                     e.setHasCourse(course==null?YesOrNoEnum.NO:course==0?YesOrNoEnum.NO:YesOrNoEnum.YES);

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

@@ -69,10 +69,9 @@ public class StudentManageController extends BaseController {
                 }
             }
         }
-        List<StudentManageListDto> rows = studentManageService.queryHasCourseStudent(queryInfo);
-        if(rows.size() > 50000){
-            throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
-        }
+        queryInfo.setIsExport(true);
+//        List<StudentManageListDto> rows = studentManageService.queryHasCourseStudent(queryInfo);
+        List<StudentManageListDto> rows = studentManageService.findStudentsByOrganId(queryInfo).getRows();
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员编号", "学员姓名", "性别", "家长姓名",
                     "家长联系电话", "是否激活", "是否有课", "是否预约陪练课","是否有陪练课", "课程余额(元)",
@@ -111,6 +110,7 @@ public class StudentManageController extends BaseController {
                 }
             }
         }
+        queryInfo.setIsExport(false);
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }