hxh před 4 měsíci
rodič
revize
5c6dfbbcc5

+ 1 - 1
src/custom/restcontroller/webmanage/sale/accessoryorder/accessoryorder.java

@@ -140,7 +140,7 @@ public class accessoryorder extends Controller {
         if (!statusList.isEmpty()) {
             querySQL.setWhere("t1.status", statusList);
         }
-        querySQL.setOrderBy("t1.sa_orderid desc");
+        querySQL.setOrderBy("t1.submitdate desc");
         Rows rows;
         querySQL.setPage(pageSize, pageNumber);
         rows = querySQL.query();

+ 6 - 0
src/custom/restcontroller/webmanage/sale/warrantycard/warrantycard.java

@@ -47,6 +47,9 @@ public class warrantycard extends Controller {
             if (whereObject.containsKey("sku") && !"".equals(whereObject.getString("sku"))) {
                 where.append(" and t1.sku ='" + whereObject.getString("sku") + "' ");
             }
+            if (whereObject.containsKey("isvoid") && !"".equals(whereObject.getString("isvoid"))) {
+                where.append(" and t1.isvoid ='" + whereObject.getString("isvoid") + "' ");
+            }
             if (whereObject.containsKey("sys_enterpriseid") && !"".equals(whereObject.getString("sys_enterpriseid"))) {
                 where.append(" and (t3.sys_enterpriseid ='" + whereObject.getString("sys_enterpriseid") + "' or t7.sys_enterpriseid ='" + whereObject.getString("sys_enterpriseid") + "') ");
             }
@@ -126,6 +129,9 @@ public class warrantycard extends Controller {
             if (whereObject.containsKey("bxjzenddate") && !"".equals(whereObject.getString("bxjzenddate"))) {
                 where.append(" and t1.enddate <='" + whereObject.getString("bxjzenddate") + "' ");
             }
+            if (whereObject.containsKey("isvoid") && !"".equals(whereObject.getString("isvoid"))) {
+                where.append(" and t1.isvoid ='" + whereObject.getString("isvoid") + "' ");
+            }
             if (whereObject.containsKey("sku") && !"".equals(whereObject.getString("sku"))) {
                 where.append(" and t1.sku ='" + whereObject.getString("sku") + "' ");
             }