Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r29401 -r29402 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29401) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29402) @@ -11463,7 +11463,7 @@ String monthlyStr = dateQueryAdapter.dateConverAdapter3("i.sendTime","mm"); reportParams.groupBySql = " group by td.riskLevel,td.tousseType "; int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3); - StringdicSql = String.format(" union all " + String dicSql = String.format(" union all " + dataIndex.getWorkAmountByMaterialSQL("发货数量", reportParams, dataSoureOfMaterialsCountOfToussesInReports)); String sql = "select * from("+ packageSql + dicSql + ") tl order by riskLevel"; return sql;