Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java =================================================================== diff -u -r40540 -r40541 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 40540) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 40541) @@ -235,19 +235,31 @@ Date start = getDate(dateRange.optJSONObject("start"),0); Date end = getDate(dateRange.optJSONObject("end"),59); if(start != null && end != null && start.before(end)){ - return recyclingRecordPoName + ".recyclingTime between " - + dateQueryAdapter.dateAdapter(start) + " and " - + dateQueryAdapter.dateAdapter(end); + return buildSqlCondition(start, end); } } - int historyRecyclingRecordValue = CssdUtils.getQueryPeroidOfModule("HistoryRecyclingRecord"); - if(historyRecyclingRecordValue <= 0){ - historyRecyclingRecordValue = 90; - } + int historyRecyclingRecordDays = getHistoryRecyclingRecordDays(); Calendar calendar = Calendar.getInstance(); Date end = calendar.getTime(); - calendar.add(Calendar.DATE, -historyRecyclingRecordValue); + calendar.add(Calendar.DATE, -historyRecyclingRecordDays); Date start = calendar.getTime(); + return buildSqlCondition(start, end); + } + + /** + * 辅助方法:获取历史回收记录天数 + */ + private int getHistoryRecyclingRecordDays() { + int days = CssdUtils.getQueryPeroidOfModule("HistoryRecyclingRecord"); + return days > 0 ? days : 90; + } + + /** + * 辅助方法:构建SQL条件字符串 + * @param start + * @param end + */ + private String buildSqlCondition(Date start, Date end) { return recyclingRecordPoName + ".recyclingTime between " + dateQueryAdapter.dateAdapter(start) + " and " + dateQueryAdapter.dateAdapter(end);