列表查询优化

pom.xml

@@ -92,7 +92,7 @@
         <dependency>
             <groupId>com.yunlian.yos</groupId>
             <artifactId>yos-core</artifactId>
-            <version>3.2.25</version>
+            <version>3.2.26</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -687,15 +687,6 @@ public class Order extends Controller {
         StringBuffer where = new StringBuffer(" 1=1 ");
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
-            if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
-                where.append(" and(");
-                where.append("t1.sonum like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t2.enterprisename like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t2.abbreviation like'%").append(whereObject.getString("condition")).append("%' ");
-//                where.append("or t5.erpbillno like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t1.remarks like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append(")");
-            }
             //状态
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 JSONArray jsonArray = whereObject.getJSONArray("status");
@@ -834,9 +825,8 @@ public class Order extends Controller {
 //        sqlFactory.addParameter_SQL("where", where);
 //        String sql = sqlFactory.getSQL();
         QuerySQL querySQL = queryListManage(where.toString());
-        Rows rows;
         querySQL.setPage(pageSize, pageNumber);
-        rows = querySQL.query();
+        Rows rows = querySQL.query();
 
         ArrayList<Long> ids = rows.toArrayList("sa_orderid", new ArrayList<>());
         ids.add(0l);

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -893,8 +893,6 @@ public class OrderItems extends Controller {
                             "select  s1.sa_orderitemsid,s1.siteid,sum(s1.qty) qty from st_stockbill_items s1 inner join st_stockbill s2 on s1.st_stockbillid=s2.st_stockbillid and s1.siteid=s2.siteid where s2.status='审核' and s2.rb=1 group by s1.sa_orderitemsid,s1.siteid) s right join sa_orderitems s1  on s.sa_orderitemsid=s1.sa_orderitemsid and s.siteid=s1.siteid where s1.qty>ifnull(s.qty,0) and s1.sa_orderitemsid=t1.sa_orderitemsid)");
                 }
             }
-
-
         }
 
         boolean isExport = content.getBooleanValue("isExport");