查询订单列表(经销商)优化

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

@@ -79,8 +79,6 @@ public class Order extends Controller {
         sqlFactory.addParameter_in("sa_orderid", sa_orderids);
         RowsMap dataRowsMap = dbConnect.runSqlQuery(sqlFactory).toRowsMap("sa_orderid");
         //查询收货人信息
-//        ArrayList<Long> rec_contactsids = rows.toArrayList("rec_contactsid", new ArrayList<>());
-//        RowsMap contactsidRowsMap = beans.order.Order.getContactsRowsMap(this, rec_contactsids);
         for (Row row : rows) {
             Rows dataRows = dataRowsMap.getOrDefault(row.getString("sa_orderid"), new Rows());
             if (dataRows.isNotEmpty()) {
@@ -89,9 +87,6 @@ public class Order extends Controller {
                 row.put("amount", 0);
                 row.put("qty", 0);
             }
-
-//            row.put("contacts", contactsidRowsMap.getOrDefault(row.getString("rec_contactsid"), new Rows()));
-
         }
 
         if (isExport) {
@@ -131,16 +126,8 @@ public class Order extends Controller {
                 "brandname");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_contacts", "t4", "t4.contactsid = t1.rec_contactsid and t4.siteid = t1.siteid",
                 "name");
-//        querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t5", "t5.ownerid=t1.sa_orderid and t5.siteid=t1.siteid and t5.ownertable='sa_order'",
-//                "backreason");
-//        querySQL.addJoinTable(JOINTYPE.left, "sys_hr", "t6", "t6.hrid = t1.saler_hrid and t6.siteid = t1.siteid");
-//        //设置别名
-//        querySQL.addQueryFields("salename", "t6.name");
-//        querySQL.addJoinTable(JOINTYPE.left, "sa_project", "t7", "t7.sa_projectid = t1.sa_projectid and t7.siteid = t1.siteid",
-//                "projectname");
         querySQL.setWhere("t1.siteid", siteid);
         querySQL.setWhere(where);
-        querySQL.setWhere("t1.type!='工具借用单'");
         querySQL.setWhere("t1.sys_enterpriseid = $sys_enterpriseid$");
         querySQL.setWhere("t1.deleted=0");
         querySQL.setWhere("((t1.createflag=1 and t1.status!='新建') or t1.createflag=0)");