Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java =================================================================== diff -u -r22555 -r28358 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java (.../ReAppTableSqlHandler.java) (revision 22555) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java (.../ReAppTableSqlHandler.java) (revision 28358) @@ -246,7 +246,6 @@ //根据开始时间和结束时间来查询 String startTime = sqlWhereParamMap.get("startTime"); String endTime = sqlWhereParamMap.get("endTime"); - String timeSearchFmt = sqlWhereParamMap.get("timeSearchFmt"); //如果开始时间为空则取当天的开始时间或者取当月的开始时间(看配置) if (StringUtils.isBlank(startTime)) { @@ -268,21 +267,11 @@ endTime = System.currentTimeMillis() + ""; } - if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime) && StringUtils.isNotBlank(timeSearchFmt)) { + if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) { String start; String end; - //精确到年月日 - if (timeSearchFmt.indexOf("H") == -1) { - start = dateQueryAdapter.dateAdapter(DateUtils.truncate(new Date(Long.parseLong(startTime)), Calendar.DAY_OF_MONTH)); - //因为要小于结束时间,所以加1天 - Date dt = DateUtils.addDays(new Date(Long.parseLong(endTime)), 1); - end = dateQueryAdapter.dateAdapter(DateUtils.truncate(dt, Calendar.DAY_OF_MONTH)); - } - //至少精确到小时 - else { - start = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(startTime))); - end = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(endTime))); - } + start = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(startTime))); + end = dateQueryAdapter.dateAdapter(new java.sql.Date(Long.parseLong(endTime))); sqlBuilder.append(String.format(" AND (po.submitTime >= %s and po.submitTime < %s OR po.recyclingTime >= %s and po.recyclingTime < %s) ", start, end, start, end)); } }