|
@@ -152,7 +152,7 @@ public class PrintController {
|
|
|
File file = new File(ReportConstants.GENERATED_FILES_DIR + filePath);
|
|
File file = new File(ReportConstants.GENERATED_FILES_DIR + filePath);
|
|
|
// 指定flush为true(强制刷新pdf、xls)
|
|
// 指定flush为true(强制刷新pdf、xls)
|
|
|
// 文件无效(不存在或过期),创建
|
|
// 文件无效(不存在或过期),创建
|
|
|
- if ((flush != null && flush.booleanValue())
|
|
|
|
|
|
|
+ if ((flush != null && flush)
|
|
|
|| !fileService.isFileValid(file.getPath(), fileService.getJrxmlFilePath(masterOfJrxml, reportName))) {
|
|
|| !fileService.isFileValid(file.getPath(), fileService.getJrxmlFilePath(masterOfJrxml, reportName))) {
|
|
|
if (printService.overload(userName, profile, reportName, whereCondition, otherParameters, Platform.PC)) {
|
|
if (printService.overload(userName, profile, reportName, whereCondition, otherParameters, Platform.PC)) {
|
|
|
throw new IllegalStateException("数据量过大,无法提供服务");
|
|
throw new IllegalStateException("数据量过大,无法提供服务");
|
|
@@ -209,7 +209,7 @@ public class PrintController {
|
|
|
File file = new File(ReportConstants.GENERATED_FILES_DIR + pdfPath);
|
|
File file = new File(ReportConstants.GENERATED_FILES_DIR + pdfPath);
|
|
|
// 指定flush为true(强制刷新pdf)
|
|
// 指定flush为true(强制刷新pdf)
|
|
|
// 文件无效(不存在或过期),重新创建pdf文件
|
|
// 文件无效(不存在或过期),重新创建pdf文件
|
|
|
- if ((flush != null && flush.booleanValue())
|
|
|
|
|
|
|
+ if ((flush != null && flush)
|
|
|
|| !fileService.isFileValid(file.getPath(), fileService.getJrxmlFilePath(masterOfJrxml, reportName))) {
|
|
|| !fileService.isFileValid(file.getPath(), fileService.getJrxmlFilePath(masterOfJrxml, reportName))) {
|
|
|
if (printService.overload(userName, profile, reportName, whereCondition, otherParameters, Platform.PC)) {
|
|
if (printService.overload(userName, profile, reportName, whereCondition, otherParameters, Platform.PC)) {
|
|
|
throw new IllegalStateException("数据量过大,无法提供服务");
|
|
throw new IllegalStateException("数据量过大,无法提供服务");
|