Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15589 -r15607 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15589) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15607) @@ -10926,7 +10926,7 @@ if(StringUtils.isBlank(startDate)){ sql += " and r.time < " + endDate + ""; }else{ - sql += " and r.time between " + startDate + " and " + endDate + " "; + sql += " and r.time >= " + startDate + " and r.time < " + endDate + " "; } if(StringUtils.isNotBlank(type)){ sql += " and d.type = '" + type + "' "; @@ -10942,7 +10942,7 @@ if(StringUtils.isBlank(startDate)){ diposableSql += " and po.sendTime < " + endDate; }else{ - diposableSql += " and po.sendTime between " + startDate + " and " + endDate; + diposableSql += " and po.sendTime >= " + startDate + " and po.sendTime < " + endDate; } if(StringUtils.isNotBlank(type)){ diposableSql += " and dg.type = '" + type + "' "; @@ -10959,7 +10959,7 @@ if(StringUtils.isBlank(startDate)){ supplyRoomDiposableGoodsSql += " and rr.time < " + endDate; }else{ - supplyRoomDiposableGoodsSql += " and rr.time between " + startDate + " and " + endDate; + supplyRoomDiposableGoodsSql += " and rr.time >= " + startDate + " and rr.time < " + endDate; } if(StringUtils.isNotBlank(type)){ supplyRoomDiposableGoodsSql += " and dg.type = '" + type + "' "; @@ -10976,7 +10976,7 @@ if(StringUtils.isBlank(startDate)){ packingRecordUsedSql += " and pr.packTime < " + endDate; }else{ - packingRecordUsedSql += " and pr.packTime between " + startDate + " and " + endDate; + packingRecordUsedSql += " and pr.packTime >= " + startDate + " and pr.packTime < " + endDate; } if(StringUtils.isNotBlank(type)){ packingRecordUsedSql += " and dg.type = '" + type + "' "; @@ -10991,7 +10991,7 @@ if(StringUtils.isBlank(startDate)){ returnGoodsSql += " and r.returnTime < " + endDate; }else{ - returnGoodsSql += " and r.returnTime between " + startDate + " and " + endDate; + returnGoodsSql += " and r.returnTime >= " + startDate + " and r.returnTime < " + endDate; } if(StringUtils.isNotBlank(type)){ returnGoodsSql += " and dg.type = '" + type + "' ";