|
@@ -9,6 +9,7 @@ import com.xjrsoft.common.model.result.RT;
|
|
|
import com.xjrsoft.common.page.ConventPage;
|
|
import com.xjrsoft.common.page.ConventPage;
|
|
|
import com.xjrsoft.common.page.PageOutput;
|
|
import com.xjrsoft.common.page.PageOutput;
|
|
|
import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
|
|
import com.xjrsoft.module.textbook.entity.TextbookWarehouseRecord;
|
|
|
|
|
+import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordExcelVo;
|
|
|
import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
|
|
import com.xjrsoft.module.textbook.vo.TextbookWarehouseRecordPageVo;
|
|
|
import com.xjrsoft.module.textbook.dto.AddTextbookWarehouseRecordDto;
|
|
import com.xjrsoft.module.textbook.dto.AddTextbookWarehouseRecordDto;
|
|
|
import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
|
|
import com.xjrsoft.module.textbook.dto.TextbookWarehouseRecordPageDto;
|
|
@@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.ByteArrayOutputStream;
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
@@ -100,8 +102,9 @@ public class TextbookWarehouseRecordController {
|
|
|
@ApiOperation(value = "导出")
|
|
@ApiOperation(value = "导出")
|
|
|
public ResponseEntity<byte[]> exportData(@Valid TextbookWarehouseRecordPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
|
|
public ResponseEntity<byte[]> exportData(@Valid TextbookWarehouseRecordPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
|
|
|
List<TextbookWarehouseRecordPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookWarehouseRecordPageVo>) page(dto).getData()).getList();
|
|
List<TextbookWarehouseRecordPageVo> customerList = isTemplate != null && isTemplate ? new ArrayList<>() : ((PageOutput<TextbookWarehouseRecordPageVo>) page(dto).getData()).getList();
|
|
|
|
|
+ List<TextbookWarehouseRecordExcelVo> dataList = BeanUtil.copyToList(customerList, TextbookWarehouseRecordExcelVo.class);
|
|
|
ByteArrayOutputStream bot = new ByteArrayOutputStream();
|
|
ByteArrayOutputStream bot = new ByteArrayOutputStream();
|
|
|
- EasyExcel.write(bot, TextbookWarehouseRecordPageVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(customerList);
|
|
|
|
|
|
|
+ EasyExcel.write(bot, TextbookWarehouseRecordExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(dataList);
|
|
|
|
|
|
|
|
return RT.fileStream(bot.toByteArray(), "TextbookClassWarehouse" + ExcelTypeEnum.XLSX.getValue());
|
|
return RT.fileStream(bot.toByteArray(), "TextbookClassWarehouse" + ExcelTypeEnum.XLSX.getValue());
|
|
|
}
|
|
}
|