Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java =================================================================== diff -u -r30316 -r30696 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java (.../WorkQualityCollectionDataIndex.java) (revision 30316) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java (.../WorkQualityCollectionDataIndex.java) (revision 30696) @@ -995,10 +995,7 @@ String year, List list,String querySupplyRoom) throws SQLException { String queryYear = year + "-01-01 00:00:00"; - String nextYear = DataIndex.getNextYear(year) + " 00:00:00"; - - String key = ""; - + String nextYear = DataIndex.getNextYear(year) + " 00:00:00"; //查询的时间段 String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(queryYear),dateQueryAdapter.dateAdapter(nextYear)); //数据库计算字符串长度的函数名 @@ -1362,7 +1359,6 @@ WorkQualityCollection tousseBean = new WorkQualityCollection(); WorkQualityCollection proxyTousseBean = new WorkQualityCollection(); WorkQualityCollection foreignTousseBean = new WorkQualityCollection(); - WorkQualityCollection bean = new WorkQualityCollection(); String queryYear = year + "-01-01 00:00:00"; String nextYear = dataIndex.getNextYear(year) + " 00:00:00";