Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java =================================================================== diff -u -r40436 -r40540 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 40436) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 40540) @@ -240,7 +240,17 @@ + dateQueryAdapter.dateAdapter(end); } } - return " (1=1) "; + int historyRecyclingRecordValue = CssdUtils.getQueryPeroidOfModule("HistoryRecyclingRecord"); + if(historyRecyclingRecordValue <= 0){ + historyRecyclingRecordValue = 90; + } + Calendar calendar = Calendar.getInstance(); + Date end = calendar.getTime(); + calendar.add(Calendar.DATE, -historyRecyclingRecordValue); + Date start = calendar.getTime(); + return recyclingRecordPoName + ".recyclingTime between " + + dateQueryAdapter.dateAdapter(start) + " and " + + dateQueryAdapter.dateAdapter(end); } private Date getDate(JSONObject dateJson,int second){ if(dateJson != null){