Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r36891 -r36998 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 36891) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 36998) @@ -321,15 +321,19 @@ .loadObjectFromFile(getJasperReportFileRealPath(parameters)); //创建“jasper文件”的对象实例 HttpSession session = StrutsParamUtils.getRequest().getSession(); JasperPrint jPrint = JasperFillManager.fillReport(jasperReport, parametMap, dataSource); - setPrintTextWidth(jPrint, reportName); - setRightPadding(jPrint, reportName); + if(!StringUtils.equals(parameters.get("jasperreportName"), "noDataReport.jasper")){ + setPrintTextWidth(jPrint, reportName); + setRightPadding(jPrint, reportName); + } session.setAttribute("JasperPrint", jPrint); //用于打印 parametMap.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE); JRDataSource dataSourceForPrint = new JRBeanCollectionDataSource(dataSourceList);//打印用数据源 JasperPrint jasperPrintForPrint = JasperFillManager.fillReport(jasperReport, parametMap, dataSourceForPrint); - setPrintTextWidth(jasperPrintForPrint, reportName); - setRightPadding(jasperPrintForPrint, reportName); + if(!StringUtils.equals(parameters.get("jasperreportName"), "noDataReport.jasper")){ + setPrintTextWidth(jasperPrintForPrint, reportName); + setRightPadding(jasperPrintForPrint, reportName); + } session.setAttribute("jasperPrintForPrint", jasperPrintForPrint); String fileName = (String) (parametMap.get("title")==null?"未命名":parametMap.get("title")); @@ -913,7 +917,9 @@ String departCoding = StrutsParamUtils.getPraramValue("departCoding", ""); return jasperReportManager.getSignGoodsSource(startDay, endDay, departCoding); } else if("tousseTournoverDaysStatisticsReport".equals(reportName)){ - return tousseTournoverDaysStatisticsReportHelper.getTousseTournoverDaysStatisticsReportData(requestParameters, parametMap); + List list = tousseTournoverDaysStatisticsReportHelper.getTousseTournoverDaysStatisticsReportData(requestParameters, parametMap); + setNoDataReport(list, requestParameters); + return list; } else if("lineGraphReportOfWorkloadByTimePeriod".equals(reportName)){ return lineGraphReportOfWorkloadByTimePeriodHelper.getLineGraphReportOfWorkloadByTimePeriodData(requestParameters, parametMap); }else if (reportName.equals("deviceMonitoring")) {// 设备监测报表