|
|
@@ -175,7 +175,11 @@ public class PrintServiceImpl implements PrintService {
|
|
|
jasperPrint = JasperFillManager.fillReport(jasperFilePath, parameters, connection);
|
|
|
}
|
|
|
|
|
|
- exportReportToXls(jasperPrint, outputStream, customCellStyle);
|
|
|
+ if (exportFileType.equals("xls")) {
|
|
|
+ exportReportToXls(jasperPrint, outputStream, customCellStyle);
|
|
|
+ } else {
|
|
|
+ exportReportToPdf(jasperPrint, outputStream, pageIndex);
|
|
|
+ }
|
|
|
logger.info("export fillReport done...");
|
|
|
data = outputStream.toByteArray();
|
|
|
outputStream.close();
|