zouxuan 5 年之前
父節點
當前提交
07dc8163e3

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -1372,7 +1372,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds, ",")));
                 Map<Integer, String> organNames = MapUtil.convertMybatisMap(organizationDao.findOrganNameMap(StringUtils.join(organIds, ",")));
                 dataList.forEach(e -> {
                 dataList.forEach(e -> {
                     e.setSubjectName(subjectNames.get(e.getSubjectId().intValue()));
                     e.setSubjectName(subjectNames.get(e.getSubjectId().intValue()));
-                    e.setOrganName(organNames.get(e.getOrganName()));
+                    e.setOrganName(organNames.get(e.getOrganId()));
                     ClassGroup classGroup = vipGroupClassGroupMap.get(e.getId().toString());
                     ClassGroup classGroup = vipGroupClassGroupMap.get(e.getId().toString());
                     if(Objects.nonNull(classGroup)){
                     if(Objects.nonNull(classGroup)){
                         e.setStudentNum(classGroup.getStudentNum());
                         e.setStudentNum(classGroup.getStudentNum());

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

@@ -95,9 +95,9 @@ public class ExportController extends BaseController {
             });
             });
         }
         }
         try {
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"陪练课编号", "课程名称", "指导老师", "班级人数", "先上课单价", "线下课单价",
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部","陪练课编号", "课程名称", "指导老师", "班级人数", "先上课单价", "线下课单价",
                     "当前课次", "总课次", "剩余课次","开课时间", "结束时间"}, new String[]{
                     "当前课次", "总课次", "剩余课次","开课时间", "结束时间"}, new String[]{
-                    "id", "name", "teacherName", "studentNum", "onlineClassesUnitPrice",
+                    "organName","id", "name", "teacherName", "studentNum", "onlineClassesUnitPrice",
                     "offlineClassesUnitPrice", "currentClassTimes", "totalClassTimes", "subClassTimes","coursesStartDate", "coursesExpireDate"}, rows);
                     "offlineClassesUnitPrice", "currentClassTimes", "totalClassTimes", "subClassTimes","coursesStartDate", "coursesExpireDate"}, rows);
             response.setContentType("application/octet-stream");
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");