Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r30813 -r30816 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 30813) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 30816) @@ -527,12 +527,10 @@ }else if(StringUtils.equals("form", type) && StringUtils.isNotBlank(queryMonth) ){ dateStr = "("+ year +"-"+ queryMonth +")"; }else if("quarterForm".equals(type)){ - dateStr = "("+ year +")"; + dateStr = "("+ year +")季度对比"; + typeStr = ""; }else{ - if("quarterForm".equals(type)){ - dateStr = "("+ year +")季度对比"; - typeStr = ""; - }else if(StringUtils.isNotBlank(queryMonth)){ + if(StringUtils.isNotBlank(queryMonth)){ dateStr = "("+ year +"-"+ queryMonth +")"; }else{ dateStr = "("+ year +")";