Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r17831 -r18052 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 17831) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 18052) @@ -2089,11 +2089,11 @@ String frequency = StrutsParamUtils.getPraramValue("frequency", ""); String sql = " select ti.sterilizerName,ti.sterileFrequency,ti.tousseName,ti.locationForDisplay," - + " ti.sterileStartTime,ti.sterilizationUser,count(*) amount from tousseinstance ti "; + + " ti.sterileEndTime,ti.sterilizationUser,count(*) amount from tousseinstance ti "; String endSql = " group by ti.sterilizerName,ti.sterileFrequency,ti.tousseName," - +" ti.locationForDisplay,ti.sterileStartTime,ti.sterilizationUser,ti.status" - +" order by ti.sterileStartTime desc"; + +" ti.locationForDisplay,ti.sterileEndTime,ti.sterilizationUser,ti.status" + +" order by ti.sterileEndTime desc"; if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) { //由于包实例TousseInstance表的sterileStartTime字段并不是date类型而是文本类型,所以改为直接用文件比较判断,虽然效率会低一点,后期优化还需待改造 @@ -2103,7 +2103,7 @@ + " and ti.status <> '已审核' " ;*/ - sql += " where ti.sterileStartTime between '" + sql += " where ti.sterileEndTime between '" + startDate+" 00:00:00'" + " and '" + endDate+" 23:59:59'" + " and ti.status <> '"+TousseInstance.STATUS_REVIEWED+"' "