Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json =================================================================== diff -u -r29761 -r29775 --- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 29761) +++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json (.../clientForAndroid.json) (revision 29775) @@ -1,7 +1,7 @@ { "success":"true", - "version":"4.7.09", - "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.09_20201204_v4_1_release.apk", - "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.09_20201204_v4_1_nologo_release.apk", - "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.09_20201204_v4_1_6p_release.apk", + "version":"4.7.10", + "urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_release.apk", + "urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_nologo_release.apk", + "urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_6p_release.apk", } \ No newline at end of file Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_release.apk =================================================================== diff -u Binary files differ Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r29763 -r29775 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 29763) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 29775) @@ -1866,7 +1866,23 @@ int firstIndex = params.optInt("firstIndex"); int maxResultCount = params.optInt("maxResultCount"); - String sql = String.format("where po.orgUnitCoding = '%s'", departCode); + Date now = new Date(); + String startTimeCondition = ""; + String startTime = params.optString("startTime"); + if(StringUtils.isNotBlank(startTime)){ + startTime += ":00"; + Date startDate = ForgonDateUtils.safelyParseDate(ForgonDateUtils.safelyFormatDate(now, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDD, null) + " " + startTime, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS); + startTimeCondition = String.format(" and po.startDate >= %s",dateQueryAdapter.dateAdapter(startDate)); + } + String endTimeCondition = ""; + String endTime = params.optString("endTime"); + if(StringUtils.isNotBlank(endTime)){ + endTime += ":59"; + Date endDate = ForgonDateUtils.safelyParseDate(ForgonDateUtils.safelyFormatDate(now, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDD, null) + " " + endTime, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS); + endTimeCondition = String.format(" and po.startDate <= %s",dateQueryAdapter.dateAdapter(endDate)); + } + + String sql = String.format("where po.orgUnitCoding = '%s' %s %s", departCode , startTimeCondition, endTimeCondition); Collection washRecords = objectDao.findBySql( WashAndDisinfectRecord.class.getSimpleName(), sql, firstIndex, maxResultCount, "startDate desc"); Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_6p_release.apk =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.10_20201204_v4_1_nologo_release.apk =================================================================== diff -u Binary files differ