Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r15202 -r15222
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 15202)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 15222)
@@ -284,22 +284,24 @@
 
 
 	/**
-	 * 创建已完成条件过滤
+	 * 创建未完成条件过滤
 	 * @param sqlBuilder 原来的sql
 	 */
 	private void createUnFinishFilterSql(StringBuilder sqlBuilder){
 		//回收状态:待回收,部分回收
 		String recyclingStatusSql = SqlBuilder.createStatus("recyclingStatus",InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
 		//发货状态:待发货,部分发货
 		String deliverStatusSql = SqlBuilder.createStatus("deliverStatus",InvoicePlan.DELIVERSTATUS_AWAITDELIVER, InvoicePlan.DELIVERSTATUS_PARTDELIVERED);
-		//归还状态:未归还,部分归还
-		String returnStatusSql = SqlBuilder.createStatus("returnStatus",InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED);
-		sqlBuilder.append(String.format(" AND (%s or %s or %s ) ",deliverStatusSql,recyclingStatusSql,returnStatusSql));
+		//归还状态:未归还,部分归还,归还待确认
+		String returnStatusSql = SqlBuilder.createStatus("returnStatus",InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED, InvoicePlan.RETURN_STATUS_AWAITCONFIRM);
+		//提交状态:committedStatus等于0
+        String commitSql = "po.committedStatus = 0 ";
+        sqlBuilder.append(String.format(" AND (%s or %s or %s or %s) ",deliverStatusSql,recyclingStatusSql,returnStatusSql,commitSql));
 	}
 
 
 	/**
-	 * 创建未完成条件过滤
+	 * 创建已完成条件过滤
 	 * @param sqlBuilder 原来的sql
 	 */
 	private void createFinishFilterSql(StringBuilder sqlBuilder){
@@ -362,12 +364,13 @@
 		String todaySql = " po.lastInvoiceTime >= " + todayBegin;
 		String todaySubmitSql = " (po.submitTime >= " + todayBegin + " and po.submitTime < " + todayEnd + ") ";
 		String beforeTodaySubmitSql = " (po.submitTime < " + todayBegin + ") ";
+        String commitSql = "po.committedStatus = 0 ";
 		sqlBuilder.append(" AND (");
 		//今天提交或者没提交的
 		sqlBuilder.append(String.format("po.submitTime is null OR %s ", todaySubmitSql));
 		sqlBuilder.append("OR (");
 		//今天之前提交的且回收状态处于待回收,部分回收;发货状态处于待发货,部分发货;归还状态处于未归还,部分归还,归还待确认;
-		sqlBuilder.append(String.format("%s AND (%s OR %s OR %s OR %s) ", beforeTodaySubmitSql, deliverStatusSql, returnStatusSql, recyclingStatusSql, todaySql));
+		sqlBuilder.append(String.format("%s AND (%s OR %s OR %s OR %s OR %s) ", beforeTodaySubmitSql,commitSql, deliverStatusSql, returnStatusSql, recyclingStatusSql, todaySql));
 		sqlBuilder.append("))");
 	}