服务申请单查询优化

src/custom/restcontroller/sale/serviceorder/serviceorder.java

@@ -36,19 +36,36 @@ public class serviceorder extends Controller {
             JSONObject whereObject = content.getJSONObject("where");
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
                 where.append(" and(");
-                where.append("t1.billno like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("t1.servicetype like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.enterprisename like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t1.reason like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.class1 like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and t1.status ='").append(whereObject.getString("status")).append("' ");
             }
+            if (whereObject.containsKey("class1") && !"".equals(whereObject.getString("class1"))) {
+                where.append(" and t1.class1 ='").append(whereObject.getString("class1")).append("' ");
+            }
+            if (whereObject.containsKey("servicetype") && !"".equals(whereObject.getString("servicetype"))) {
+                where.append(" and t1.servicetype ='").append(whereObject.getString("servicetype")).append("' ");
+            }
+            if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
+                where.append(" and t1.status ='").append(whereObject.getString("status")).append("' ");
+            }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
-                where.append(" and t1.submitdate >='").append(whereObject.getString("begindate")).append("' ");
+                where.append(" and t1.submitdate >='").append(whereObject.getString("begindate")).append("'");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
-                where.append(" and t1.submitdate <='").append(whereObject.getString("enddate")).append("' ");
+                where.append(" and t1.submitdate <='").append(whereObject.getString("enddate")).append("'");
+            }
+            if (whereObject.containsKey("submitdate") && !"".equals(whereObject.getString("submitdate"))) {
+                where.append(" and DATE_FORMAT(t1.submitdate , '%Y-%m-%d')='").append(whereObject.getString("submitdate")).append("'");
+            }
+
+            if (whereObject.containsKey("phonenumber") && !"".equals(whereObject.getString("phonenumber"))) {
+                where.append(" and t1.scenecontactphonenumber ='").append(whereObject.getString("phonenumber")).append("'");
             }
         }
 //        SQLFactory sqlFactory = new SQLFactory(this, "服务申请单列表查询", pageSize, pageNumber, pageSorting);