|
|
@@ -771,6 +771,20 @@ public class OrderItems extends Controller {
|
|
|
if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
|
|
|
where.append(" and DATE_FORMAT(t5.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
|
|
|
}
|
|
|
+ if (whereObject.containsKey("begindate1") && !"".equals(whereObject.getString("begindate1"))) {
|
|
|
+ where.append(" and DATE_FORMAT(t5.submitdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate1")).append("' ");
|
|
|
+ }
|
|
|
+ if (whereObject.containsKey("enddate1") && !"".equals(whereObject.getString("enddate1"))) {
|
|
|
+ where.append(" and DATE_FORMAT(t5.submitdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate1")).append("' ");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (whereObject.containsKey("begindate2") && !"".equals(whereObject.getString("begindate2"))) {
|
|
|
+ where.append(" and DATE_FORMAT(t5.checkdate, '%Y-%m-%d') >='").append(whereObject.getString("begindate2")).append("' ");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (whereObject.containsKey("enddate2") && !"".equals(whereObject.getString("enddate2"))) {
|
|
|
+ where.append(" and DATE_FORMAT(t5.checkdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate2")).append("' ");
|
|
|
+ }
|
|
|
if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
|
|
|
where.append(" and t5.status ='").append(whereObject.getString("status")).append("' ");
|
|
|
}
|