工单及服务单优化

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

@@ -348,12 +348,25 @@ public class serviceorder extends Controller {
             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("'");
             }
             if (whereObject.containsKey("enddate") && !"".equals(whereObject.getString("enddate"))) {
                 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("'");
             }

src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -405,6 +405,9 @@ public class workorder extends Controller {
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and t1.status ='").append(whereObject.getString("status")).append("'");
             }
+            if (whereObject.containsKey("type") && !"".equals(whereObject.getString("type"))) {
+                where.append(" and t1.type ='").append(whereObject.getString("type")).append("'");
+            }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
                 where.append(" and t1.createdate >='").append(whereObject.getString("begindate")).append("'");
             }
@@ -414,6 +417,10 @@ public class workorder extends Controller {
             if (whereObject.containsKey("sys_enterpriseid") && !"".equals(whereObject.getString("sys_enterpriseid"))) {
                 where.append(" and t1.sys_enterpriseid ='").append(whereObject.getString("sys_enterpriseid")).append("'");
             }
+            if (whereObject.containsKey("finishdate") && !"".equals(whereObject.getString("finishdate"))) {
+                where.append(" and DATE_FORMAT(t1.finishdate, '%Y-%m-%d') ='").append(whereObject.getString("finishdate")).append("'");
+            }
+
         }
         SQLFactory sqlFactory = new SQLFactory(this, "服务工单列表查询");
         sqlFactory.addParameter("siteid", siteid);