|
@@ -13,11 +13,14 @@ import com.fdkankan.tk.response.UserMsgVo;
|
|
|
import com.fdkankan.tk.service.DataCountService;
|
|
|
import com.fdkankan.tk.service.IExcelService;
|
|
|
import com.fdkankan.tk.service.IRoomService;
|
|
|
+import com.fdkankan.tk.util.ExportUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
|
|
|
@RestController
|
|
|
public class DataCountController extends BaseController {
|
|
@@ -92,11 +95,15 @@ public class DataCountController extends BaseController {
|
|
|
ExcelWriter excelWriter = null;
|
|
|
try {
|
|
|
if(getLang().equals("zh")){
|
|
|
+ List<RoomListDataVo> records = page.getRecords();
|
|
|
excelWriter = EasyExcel.write(response.getOutputStream(),RoomListDataVo.class).build();
|
|
|
+ excelService.commonExport(request,response,"房间数据", records,excelWriter);
|
|
|
}else {
|
|
|
+ List<RoomListDataVo> records = page.getRecords();
|
|
|
+ List<RoomListDataEnVo> recordEns = ExportUtil.RoomListDataToEn(records);
|
|
|
excelWriter = EasyExcel.write(response.getOutputStream(),RoomListDataEnVo.class).build();
|
|
|
+ excelService.commonExport(request,response,"房间数据", recordEns,excelWriter);
|
|
|
}
|
|
|
- excelService.commonExport(request,response,"房间数据", page.getRecords(),excelWriter);
|
|
|
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|