Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r13452 -r13484 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 13452) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 13484) @@ -1625,9 +1625,9 @@ + "' and po.sterilizationPurpose!='" + SterilizationRecord.STERILIZATIONPURPOSE_TYPE + "' and po.endDate<=" - + dateQueryAdapter.dateAdapter(format.format(end)) + + dateQueryAdapter.dateAdapter1(format.format(end)) + " and po.endDate>=" - + dateQueryAdapter.dateAdapter(format.format(begin)); + + dateQueryAdapter.dateAdapter1(format.format(begin)); List records = objectDao.findBySql( SterilizationRecord.class.getSimpleName(), sql, "endDate desc"); if (records != null && records.size() != 0) { Index: ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js =================================================================== diff -u -r12331 -r13484 --- ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js (.../recallRecordView.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js (.../recallRecordView.js) (revision 13484) @@ -30,7 +30,7 @@ var sterilizingFrequency_end = top.Ext.getCmp('sterilizingFrequency_end').getValue(); recallTousseColumnTree.loader.on('beforeload',function(){ recallTousseColumnTree.loader.baseParams.sterilizerName = sterilizerName; - recallTousseColumnTree.loader.baseParams.startDate = startDate; + recallTousseColumnTree.loader.baseParams.startDate = startDate + " 00:00:00"; recallTousseColumnTree.loader.baseParams.endDate = endDate; recallTousseColumnTree.loader.baseParams.sterilizingFrequency_start = sterilizingFrequency_start; recallTousseColumnTree.loader.baseParams.sterilizingFrequency_end = sterilizingFrequency_end; Index: forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java =================================================================== diff -u -r13073 -r13484 --- forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java (.../DateQueryAdapter.java) (revision 13073) +++ forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java (.../DateQueryAdapter.java) (revision 13484) @@ -40,6 +40,25 @@ return ""; } /** + * 替换sql查询条件的日期 oracle的格式包括毫秒 yyyy-mm-dd HH24:MI:SS.SSS + * + * @param date + * @return + */ + public String dateAdapter1(String date) { + String database = dbConnection.getDatabase(); + if (StringUtils.isNotBlank(date)) { + if (DatabaseUtil.isSqlServer(database)) { + return "convert(datetime,'" + date + "',120)"; + } else if (DatabaseUtil.isOracle(database)) { + return "to_timestamp('" + date + "','yyyy-mm-dd HH24:MI:SS.ff9')"; + } else if (DatabaseUtil.isMySQL(database)) { + return "'" + date + "'"; + } + } + return ""; + } + /** * 生成日期时间的区间查询条件,可以连接到and 或者 where 子句后面 * @param property po的属性字符串。如po.time * @param startDateTime 开始的日期时间