Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r17390 -r17394 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17390) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17394) @@ -13549,11 +13549,15 @@ String timeCompareSql = ""; String database = dbConnection.getDatabase(); if(DatabaseUtil.isOracle(database)){ + // 按天算次日下送时间,只要不是当天回收当天发,都是次日下送. + timeCompareSql = " trunc(iv.sendTime) - trunc(iv.recyclingTime) > 0 "; // 按24小时算,两者相减的单位是24小时,> 1即大于24小时 - timeCompareSql = " trunc(iv.sendTime,'hh24') - trunc(iv.recyclingTime,'hh24') > 1"; +// timeCompareSql = " trunc(iv.sendTime,'hh24') - trunc(iv.recyclingTime,'hh24') > 1"; }else{ + // 按天算次日下送时间,只要不是当天回收当天发,都是次日下送. + timeCompareSql = " DATEDIFF(DAY,iv.recyclingTime,iv.sendTime) > 0 "; // 按小时计算,单位是小时 超过24小时算次日下送 - timeCompareSql = " DATEDIFF(HOUR,iv.recyclingTime,iv.sendTime) >= 24 "; +// timeCompareSql = " DATEDIFF(HOUR,iv.recyclingTime,iv.sendTime) >= 24 "; } dataSql = dateQueryAdapter.dateToVarchar1("iv.recyclingTime"); // 获取次日下送数量的sql