yanite 3 years ago
parent
commit
7e8fa6322d

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

@@ -40,5 +40,5 @@ public interface ExportService {
     * @author zx
     * @author zx
     * @date 2021/11/5 11:38 
     * @date 2021/11/5 11:38 
     */
     */
-    void studentVipPractice(String organId, ManagerDownload managerDownload) throws FileNotFoundException;
+    void studentVipPractice(String organId, ManagerDownload managerDownload, Integer tenantId) throws FileNotFoundException;
 }
 }

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -959,8 +959,8 @@ public class ExportServiceImpl implements ExportService {
 
 
     @Override
     @Override
     @Async
     @Async
-    public void studentVipPractice(String organId, ManagerDownload managerDownload) throws FileNotFoundException {
-        List<StudentVipPracticeExportDto> studentVipPracticeExportDtos = courseScheduleStudentPaymentDao.exportStudentVipPractice(organId, TenantContextHolder.getTenantId());
+    public void studentVipPractice(String organId, ManagerDownload managerDownload, Integer tenantId) throws FileNotFoundException {
+        List<StudentVipPracticeExportDto> studentVipPracticeExportDtos = courseScheduleStudentPaymentDao.exportStudentVipPractice(organId, tenantId);
         if(studentVipPracticeExportDtos != null && studentVipPracticeExportDtos.size() > 0){
         if(studentVipPracticeExportDtos != null && studentVipPracticeExportDtos.size() > 0){
             List<Integer> studentIds = studentVipPracticeExportDtos.stream().map(e -> e.getUserId()).collect(Collectors.toList());
             List<Integer> studentIds = studentVipPracticeExportDtos.stream().map(e -> e.getUserId()).collect(Collectors.toList());
             //获取学员最后一节已结束的vip课的老师以及编号
             //获取学员最后一节已结束的vip课的老师以及编号

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

@@ -1260,6 +1260,7 @@ public class ExportController extends BaseController {
         if (!hasCourse) {
         if (!hasCourse) {
             return failed("没有可导出的数据");
             return failed("没有可导出的数据");
         }
         }
+        Integer tenantId = TenantContextHolder.getTenantId();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         Date nowDate = new Date();
         Date nowDate = new Date();
         String no = idGeneratorService.generatorId("download") + "";
         String no = idGeneratorService.generatorId("download") + "";
@@ -1272,7 +1273,7 @@ public class ExportController extends BaseController {
         managerDownload.setCreateTime(nowDate);
         managerDownload.setCreateTime(nowDate);
         managerDownload.setUpdateTime(nowDate);
         managerDownload.setUpdateTime(nowDate);
         managerDownloadDao.insert(managerDownload);
         managerDownloadDao.insert(managerDownload);
-        exportService.studentVipPractice(organId, managerDownload);
+        exportService.studentVipPractice(organId, managerDownload, tenantId);
         HttpResponseResult<Object> succeed = succeed();
         HttpResponseResult<Object> succeed = succeed();
         succeed.setMsg(fileName + "导出申请已提交,请到【报表中心-下载列表查看】");
         succeed.setMsg(fileName + "导出申请已提交,请到【报表中心-下载列表查看】");
         return succeed;
         return succeed;