Merge remote-tracking branch 'origin/develop' into develop

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

@@ -17,10 +17,7 @@ import common.YosException;
 import common.annotation.API;
 import common.annotation.CACHEING;
 import common.annotation.CACHEING_CLEAN;
-import common.data.Row;
-import common.data.Rows;
-import common.data.RowsMap;
-import common.data.SQLFactory;
+import common.data.*;
 import org.apache.commons.lang.StringUtils;
 import restcontroller.R;
 import restcontroller.sale.cashbill.cashbill;
@@ -267,10 +264,26 @@ public class aftersalesmag extends Controller {
                 where.append(" and t1.billdate <='" + whereObject.getString("enddate")).append("' ");
             }
         }
-        SQLFactory sqlFactory = new SQLFactory(this, "返退单列表查询", pageSize, pageNumber, pageSorting);
-        sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter_SQL("where", where);
-        Rows rows = dbConnect.runSqlQuery(sqlFactory);
+//        SQLFactory sqlFactory = new SQLFactory(this, "返退单列表查询", pageSize, pageNumber, pageSorting);
+//        sqlFactory.addParameter("siteid", siteid);
+//        sqlFactory.addParameter_SQL("where", where);
+//        Rows rows = dbConnect.runSqlQuery(sqlFactory);
+
+        QuerySQL querySQL=SQLFactory.createQuerySQL(this,"sa_aftersalesmag");
+        querySQL.addJoinTable(JOINTYPE.left,"sys_enterprise","t2","t1.sys_enterpriseid = t2.sys_enterpriseid AND t1.siteid = t2.siteid",
+                "enterprisename","abbreviation","phonenumber");
+        querySQL.addJoinTable(JOINTYPE.left,"sa_order","t3","t1.sa_orderid = t3.sa_orderid AND t1.siteid = t3.siteid",
+                "sonum");
+        querySQL.addJoinTable(JOINTYPE.left,"sa_accountclass","t4","t1.sa_accountclassid = t4.sa_accountclassid AND t1.siteid = t4.siteid",
+                "accountno","accountname");
+        querySQL.addJoinTable(JOINTYPE.left,"sa_agents","t5","t1.sys_enterpriseid = t5.sys_enterpriseid AND t1.siteid = t5.siteid",
+                "agentnum");
+
+        querySQL.setWhere("t1.siteid",siteid);
+        querySQL.setWhere(where.toString());
+        querySQL.setPage(pageSize,pageNumber).setOrderBy(pageSorting).setTableAlias("t1");
+        Rows rows=querySQL.query();
+
 
         ArrayList<Long> ids = rows.toArrayList("sa_aftersalesmagid", new ArrayList<>());
         //查询反退金额