Browse Source

Merge branch 'zx_saas_training_202303' of http://git.dayaedu.com/yonge/mec into master_saas

zouxuan 2 years ago
parent
commit
82870655a4

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

@@ -573,12 +573,12 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
     }
 
     /**
-     * 导出小小训练营详情
+     * 导出小小训练营详情
      */
     public void exportUserTrainingDetail(Map<String, Object> param, HttpServletResponse response) throws IOException {
         //训练营详情-查询条件时间设置
         queryUserTrainingDetailOpsParam(param);
-        List<TempCampUserTrainingDetailVo> list = baseMapper.queryUserTrainingDetail(param);
+        List<TempCampUserTrainingDetailVo> list = this.queryUserTrainingDetail(param).getRows();
         OutputStream outputStream = response.getOutputStream();
         HSSFWorkbook workbook = null;
         try {

+ 1 - 0
mec-web/src/main/java/com/ym/mec/web/controller/TempLittleArtistTrainingCampController.java

@@ -156,6 +156,7 @@ public class TempLittleArtistTrainingCampController extends BaseController {
     @ApiOperation(value="导出训练营详情")
     @PostMapping(value = "/exportUserTrainingDetail")
     public void exportUserTrainingDetail(@RequestBody Map<String, Object> param, HttpServletResponse response) throws IOException{
+        param.put("rows", 49999);
         tempLittleArtistTrainingCampService.exportUserTrainingDetail(param, response);
     }