bug修复

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -546,6 +546,18 @@ public class Order extends Controller {
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
                 where.append(" and t1.billdate <='").append(whereObject.getString("enddate")).append("' ");
             }
+            if (whereObject.containsKey("begindate1") && !"".equals(whereObject.getString("begindate1"))) {
+                where.append(" and t1.submitdate >='").append(whereObject.getString("begindate1")).append("' ");
+            }
+            if (whereObject.containsKey("enddate1") && !"".equals(whereObject.getString("enddate1"))) {
+                where.append(" and t1.submitdate <='").append(whereObject.getString("enddate1")).append("' ");
+            }
+            if (whereObject.containsKey("begindate2") && !"".equals(whereObject.getString("begindate2"))) {
+                where.append(" and t1.checkdate >='").append(whereObject.getString("begindate2")).append("' ");
+            }
+            if (whereObject.containsKey("enddate2") && !"".equals(whereObject.getString("enddate2"))) {
+                where.append(" and t1.checkdate <='").append(whereObject.getString("enddate2")).append("' ");
+            }
             if (whereObject.containsKey("remarks") && !"".equals(whereObject.getString("remarks"))) {
                 where.append("and t1.remarks like'%").append(whereObject.getString("remarks")).append("%' ");
             }