Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r31312 -r31338 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 31312) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 31338) @@ -515,25 +515,25 @@ typeStr = "表格"; } if (StringUtils.equals("firstSecondHalfForm", type)) { - dateStr = "("+ year +")上下半年对比"; + dateStr = "("+ year +"年)上下半年对比"; typeStr = ""; parametMap.put("title1", "上半年"); parametMap.put("title2", "下半年"); } else if (StringUtils.equals("compareLastForm", type)) { - dateStr = "("+ year +")跟去年对比"; + dateStr = "("+ year +"年)跟去年对比"; typeStr = ""; parametMap.put("title1", "去年"); parametMap.put("title2", "今年"); }else if(StringUtils.equals("form", type) && StringUtils.isNotBlank(queryMonth) ){ dateStr = "("+ year +"-"+ queryMonth +")"; }else if("quarterForm".equals(type)){ - dateStr = "("+ year +")季度对比"; + dateStr = "("+ year +"年)季度对比"; typeStr = ""; }else{ if(StringUtils.isNotBlank(queryMonth)){ dateStr = "("+ year +"-"+ queryMonth +")"; }else{ - dateStr = "("+ year +")"; + dateStr = "("+ year +"年)"; } } if(StringUtils.isNotBlank(inspectItem)){