|
@@ -75,10 +75,10 @@ public class Afterserviceorder extends Controller {
|
|
|
if(where!=null){
|
|
if(where!=null){
|
|
|
DBConnect dbConnect=new DBConnect();
|
|
DBConnect dbConnect=new DBConnect();
|
|
|
if(where.containsKey("fstatus")&&!StringUtils.isBlank(where.getString("fstatus"))){
|
|
if(where.containsKey("fstatus")&&!StringUtils.isBlank(where.getString("fstatus"))){
|
|
|
- wherestr+=" and fstatus = '"+where.getString("fstatus")+"'";
|
|
|
|
|
|
|
+ wherestr+=" and t.fstatus = '"+where.getString("fstatus")+"'";
|
|
|
}
|
|
}
|
|
|
if(where.containsKey("ftype")&&!StringUtils.isBlank(where.getString("ftype"))){
|
|
if(where.containsKey("ftype")&&!StringUtils.isBlank(where.getString("ftype"))){
|
|
|
- wherestr+=" and ftype = '"+where.getString("ftype")+"'";
|
|
|
|
|
|
|
+ wherestr+=" and t.ftype = '"+where.getString("ftype")+"'";
|
|
|
}
|
|
}
|
|
|
if(where.containsKey("startdate")&&!StringUtils.isBlank(where.getString("startdate"))){
|
|
if(where.containsKey("startdate")&&!StringUtils.isBlank(where.getString("startdate"))){
|
|
|
wherestr+=" and t.createdate >= '"+where.getString("startdate")+"'";
|
|
wherestr+=" and t.createdate >= '"+where.getString("startdate")+"'";
|