Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r34155 -r34163 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34155) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34163) @@ -2734,13 +2734,22 @@ String year = StrutsParamUtils.getPraramValue("year", null); String type = StrutsParamUtils.getPraramValue("type", null); String title = null; + String showReportName = null; + String dataConfigStr = CssdUtils.getSystemSetConfigByName("workQualityCollectionReportConfiguration"); + if(!StringUtils.isBlank(dataConfigStr)){ + JSONObject dataConfigObj = JSONObject.fromObject(dataConfigStr); + showReportName = dataConfigObj.optString("reportName"); + } + if(StringUtils.isBlank(showReportName)){ + showReportName = "工作质量评价指标报表"; + } if (StringUtils.equals("allYear", type)) { - title = year + "年工作质量评价指标报表"; + title = year + "年" + showReportName; } else if (StringUtils.equals("split", type)) { - title = year + "年上半年、下半年工作质量评价指标报表"; + title = year + "年上半年、下半年" + showReportName; } else { title = (Integer.valueOf(year) - 1) + "年、" + year - + "年工作质量评价指标报表"; + + "年" + showReportName; } map.put("title", title); return map;