Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r14479 -r14498
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14479)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14498)
@@ -810,8 +810,10 @@
 				String[] applyDateArray = StringUtils.split(applyDate,";");
 				out_beginTime = sdf.parse(applyDateArray[0] + " 00:00:00");
 				out_endTime = sdf.parse(applyDateArray[1] + " 23:59:59");
-				where7 = String.format("applicationTime between %s and %s",
+				where7 = String.format("(applicationTime between %s and %s or po in (select recyclingApplication from RecyclingRecord where recyclingTime between %s and %s))",
 					dateQueryAdapter.dateAdapter(out_beginTime),
+					dateQueryAdapter.dateAdapter(out_endTime),
+					dateQueryAdapter.dateAdapter(out_beginTime),
 					dateQueryAdapter.dateAdapter(out_endTime));
 			}catch (Exception e) {
 				Log.error("" , e);