|
|
@@ -217,29 +217,29 @@ public class stockbill extends Controller {
|
|
|
where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') <='").append(whereObject.getString("enddate")).append("' ");
|
|
|
}
|
|
|
if (whereObject.containsKey("remarks") && !"".equals(whereObject.getString("remarks"))) {
|
|
|
- where.append("and t1.remarks like'%").append(whereObject.getString("remarks")).append("%' ");
|
|
|
+ where.append(" and t1.remarks like'%").append(whereObject.getString("remarks")).append("%' ");
|
|
|
}
|
|
|
if (whereObject.containsKey("dateinterval") && !"".equals(whereObject.getString("dateinterval"))) {
|
|
|
if (whereObject.getString("dateinterval").equals("past30days")) {
|
|
|
- where.append("and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >=DATE_SUB(CURDATE(), INTERVAL 30 DAY)");
|
|
|
+ where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >=DATE_SUB(CURDATE(), INTERVAL 30 DAY)");
|
|
|
} else if (whereObject.getString("dateinterval").equals("past15days")) {
|
|
|
- where.append("and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >=DATE_SUB(CURDATE(), INTERVAL 15 DAY)");
|
|
|
+ where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >=DATE_SUB(CURDATE(), INTERVAL 15 DAY)");
|
|
|
} else if (whereObject.getString("dateinterval").equals("today")) {
|
|
|
- where.append("and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >=CURDATE()");
|
|
|
+ where.append(" and DATE_FORMAT(t1.billdate, '%Y-%m-%d') >=CURDATE()");
|
|
|
}
|
|
|
}
|
|
|
if (whereObject.containsKey("checknoprint") && !"".equals(whereObject.getString("checknoprint"))) {
|
|
|
if (whereObject.getBooleanValue("checknoprint")) {
|
|
|
- where.append("and t1.status ='审核' and isreport=0");
|
|
|
+ where.append(" and t1.status ='审核' and isreport=0");
|
|
|
}
|
|
|
}
|
|
|
if (whereObject.containsKey("nowaybillgenerated") && !"".equals(whereObject.getString("nowaybillgenerated"))) {
|
|
|
if (whereObject.getBooleanValue("checknoprint")) {
|
|
|
- where.append("and t1.isreceiver=0 and ifnull(txlogisticid,'')='' ");
|
|
|
+ where.append(" and t1.isreceiver=0 and ifnull(txlogisticid,'')='' ");
|
|
|
}
|
|
|
}
|
|
|
if (whereObject.containsKey("paynocheck") && !"".equals(whereObject.getString("paynocheck"))) {
|
|
|
- where.append("and t1.status ='新建' and delivery='到付'");
|
|
|
+ where.append(" and t1.status ='新建' and delivery='到付'");
|
|
|
}
|
|
|
}
|
|
|
|