Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java =================================================================== diff -u -r14407 -r14746 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java (.../MaintainAction.java) (revision 14407) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java (.../MaintainAction.java) (revision 14746) @@ -319,19 +319,24 @@ } public void resetWashWorkLoad(){ - @SuppressWarnings("unchecked") - List list = objectDao - .findAllObjects(WashAndDisinfectRecord.class.getSimpleName()); - SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj(); - boolean secondWashCountWorkload = true; - if (config != null) { - secondWashCountWorkload = config.getSecondWashCountWorkload(); - } - if (list != null) { - for (WashAndDisinfectRecord record : list) { - maintainManager.resetWashWorkLoad(record, - secondWashCountWorkload); + String fromDate = StrutsParamUtils.getPraramValue("from", null); + String toDate = StrutsParamUtils.getPraramValue("to", null); + if(StringUtils.isNotBlank(fromDate) && StringUtils.isNotBlank(toDate)){ + fromDate += " 00:00:00"; + toDate += " 23:59:59"; + String sql = "where po.endDate between "+dateQueryAdapter.dateAdapter(fromDate)+" and " + dateQueryAdapter.dateAdapter(toDate); + List list = objectDao.findBySql(WashAndDisinfectRecord.class.getSimpleName(),sql); + SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj(); + boolean secondWashCountWorkload = true; + if (config != null) { + secondWashCountWorkload = config.getSecondWashCountWorkload(); } + if (list != null) { + for (WashAndDisinfectRecord record : list) { + maintainManager.resetWashWorkLoad(record, + secondWashCountWorkload); + } + } } }