|
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
import java.net.URLDecoder;
|
|
import java.net.URLDecoder;
|
|
|
|
|
+import java.net.URLEncoder;
|
|
|
import java.sql.SQLException;
|
|
import java.sql.SQLException;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -135,7 +136,12 @@ public class PrintController {
|
|
|
// 预览或打印
|
|
// 预览或打印
|
|
|
case PREVIEW:
|
|
case PREVIEW:
|
|
|
case PRINT:
|
|
case PRINT:
|
|
|
- response.sendRedirect(String.format("../preview?id=%s&printType=%s&reportName=%s", id, printParameter.getPrintType(), printParameter.getReportName()));
|
|
|
|
|
|
|
+ String reportName = printParameter.getReportName();
|
|
|
|
|
+ String previewUrl = String.format("../preview?id=%s&printType=%s", id, printParameter.getPrintType());
|
|
|
|
|
+ if(!StringUtils.isEmpty(reportName)){
|
|
|
|
|
+ previewUrl += "&reportName=" + URLEncoder.encode(reportName, "UTF-8");
|
|
|
|
|
+ }
|
|
|
|
|
+ response.sendRedirect(previewUrl);
|
|
|
break;
|
|
break;
|
|
|
case PDF:
|
|
case PDF:
|
|
|
export(id, ExportType.PDF.name(), true, request, response);
|
|
export(id, ExportType.PDF.name(), true, request, response);
|