Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r40450 -r40485 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 40450) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 40485) @@ -2751,8 +2751,12 @@ public StockTakeRecord getStockTakeRecord(String date,Long warehouseId){ if(StringUtils.isNotBlank(date) && warehouseId != null){ - String startDate = dateQueryAdapter.dateAdapter(date + " 00:00:00"); - String endDate = dateQueryAdapter.dateAdapter(date + " 23:59:59"); + int len = date.length(); + String timeSuffix = (len > 15) ? ":00" : " 00:00:00"; + String endSuffix = (len > 15) ? ":59" : " 23:59:59"; + + String startDate = dateQueryAdapter.dateAdapter(date + timeSuffix); + String endDate = dateQueryAdapter.dateAdapter(date + endSuffix); String sql = "where po.stockTakeDate between "+startDate+" and " + endDate + " and po.warehouseId = "+warehouseId+" order by po.id desc"; @SuppressWarnings("unchecked") List list = objectDao.findBySql(StockTakeRecord.class.getSimpleName(), sql);