接口返回listqueryid

src/custom/restcontroller/webmanage/hr/SQL/员工列表查询.sql

@@ -1,29 +0,0 @@
-select t1.hrid,
-       t1.hrcode,
-       t1.name,
-       t1.sex,
-       t1.createby,
-       t1.createdate,
-       t1.changeby,
-       t1.changedate,
-       t1.phonenumber,
-       t1.officetelephone,
-       t1.status,
-       t2.depname,
-       t2.depfullname,
-       t1.position,
-       t1.isleader,
-       t1.isworker,
-       t1.email,
-       t4.name        as reporthrname,
-       t3.userid,
-       t3.phonenumber as userphonenumber,
-       t3.name        as username,
-       t3.accountno,
-       t1.ismanage
-from sys_hr t1
-         inner join sys_department t2 on t1.siteid = t2.siteid and t1.departmentid = t2.departmentid
-         left join sys_users t3 on t1.userid = t3.userid
-         left join sys_hr t4 on t1.siteid = t4.siteid and t1.reporthrid = t4.hrid
-where t1.siteid = $siteid$
-  and t1.departmentid in $departmentid$ and $where$

src/custom/restcontroller/webmanage/hr/hr.java

@@ -77,11 +77,24 @@ public class hr extends Controller {
                 departmentidsList = dbConnect.runSqlQuery("SELECT departmentid from sys_department  WHERE siteid = '" + siteid + "' AND isused").toArrayList("departmentid", new ArrayList<>());
             }
         }
-        SQLFactory sqlFactory = new SQLFactory(this, "员工列表查询", pageSize, pageNumber, pageSorting);
-        sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter_in("departmentid", departmentidsList);
-        sqlFactory.addParameter_SQL("where", where);
-        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+
+
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_hr", "t1.*").setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_department", "t2", "t1.siteid = t2.siteid and t1.departmentid = t2.departmentid",
+                "depname","depfullname");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_users", "t3", "t1.userid = t3.userid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_hr", "t4", "t1.siteid = t4.siteid and t1.reporthrid = t4.hrid");
+
+        querySQL.addQueryFields("reporthrname","t4.name");
+        querySQL.addQueryFields("username","t3.name");
+        querySQL.addQueryFields("userphonenumber","t3.phonenumber");
+        querySQL.setWhere("t1.departmentid",departmentidsList);
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere(where);
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+
+
         Rows rolerows = dbConnect.runSqlQuery("select t2.rolename,t1.userid from sys_userrole t1 inner join sys_role t2 on t1.siteid=t2.siteid and t1.roleid=t2.roleid where t1.siteid='" + siteid + "'");
         RowsMap rolerowsMap = rolerows.toRowsMap("userid");
         ArrayList<Long> hridList = rows.toArrayList("hrid", new ArrayList<>());

src/custom/restcontroller/webmanage/role/SQL/角色列表查询.sql

@@ -1,14 +0,0 @@
-select t1.roleid,
-       t1.rolename,
-       t1.remarks,
-       t1.usertype,
-       t1.issystem,
-       t1.createby,
-       t1.createdate,
-       t1.changeby,
-       t1.changedate,
-       t1.siteid
-from sys_role t1
-where t1.siteid = $siteid$
-  and ifnull(sys_enterpriseid, 0) = 0
-  and $where$

src/custom/restcontroller/webmanage/role/role.java

@@ -10,10 +10,7 @@ import common.annotation.API;
 import common.annotation.CACHEING;
 import common.annotation.CACHEING_CLEAN;
 import common.annotation.cm;
-import common.data.Row;
-import common.data.Rows;
-import common.data.RowsMap;
-import common.data.SQLFactory;
+import common.data.*;
 import restcontroller.R;
 
 import java.util.ArrayList;
@@ -51,10 +48,14 @@ public class role extends Controller {
                 where.append(")");
             }
         }
-        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,"sys_role","t1.*").setTableAlias("t1");
+        querySQL.setWhere("ifnull(sys_enterpriseid, 0) = 0");
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere(  where);
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+
         HashMap<String, String> usertypemap = getOptionType("usertype");
         for (Row row : rows) {
             row.put("usertypename", usertypemap.get(row.getString("usertype")));

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -359,10 +359,21 @@ public class Item extends Controller {
         }
 
 
-        SQLFactory sqlFactory = new SQLFactory(this, "货品档案列表", pageSize, pageNumber, pageSorting);
-        sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter_SQL("where", where);
-        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+//        SQLFactory sqlFactory = new SQLFactory(this, "货品档案列表", pageSize, pageNumber, pageSorting);
+//        sqlFactory.addParameter("siteid", siteid);
+//        sqlFactory.addParameter_SQL("where", where);
+//        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "plm_item", "t1.*").setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_unit", "t2", "t2.unitid = t1.unitid AND t2.siteid = t1.siteid",
+                "unitname");
+        querySQL.addJoinTable(JOINTYPE.left, "plm_itemextend", "t3", "t3.itemid = t1.itemid AND t3.siteid = t1.siteid",
+                "erpitemname","erpitemno");
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere(  where);
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+
+
         // 默认商品图片
         Rows defaultImageRows = beans.Item.Item.getItemdefaultImage(this);
         // 附件

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案列表.sql

@@ -1,22 +0,0 @@
-SELECT t1.itemid,
-       t1.itemno,
-       t1.itemname,
-       t1.`status`,
-       t1.onsaledate,
-       t1.model,
-       t1.spec,
-       t1.isonsale,
-       t1.assistance,
-       t1.goodstype,
-       t1.explains,
-       t1.orderaddqty,
-       t1.orderminqty,
-       t1.marketprice,
-       t2.unitname,
-       t3.erpitemname,
-       t3.erpitemno
-FROM plm_item t1
-         LEFT JOIN plm_unit t2 ON t2.unitid = t1.unitid AND t2.siteid = t1.siteid
-         LEFT JOIN plm_itemextend t3 ON t3.itemid = t1.itemid AND t3.siteid = t1.siteid
-WHERE t1.siteid = $siteid$
-  and $where$ and t1.isshow=1

src/custom/restcontroller/webmanage/sale/salearea/SQL/业务员列表查询.sql

@@ -1,29 +0,0 @@
-select t4.sa_salearea_hrid,
-       t4.discountrate,
-       t4.iseditprice,
-       t1.hrid,
-       t1.hrcode,
-       t1.name,
-       t1.sex,
-       t1.phonenumber,
-       t1.position,
-       t1.email,
-       t1.status,
-       t5.sa_saleareaid,
-       t5.areaname,
-       t5.areafullname,
-       t2.depname,
-       t2.depfullname,
-       t3.name as reporthrname,
-       t6.userid,
-       t6.accountno,
-       t1.officetelephone,
-       t6.phonenumber userphonenumber
-from sys_hr t1
-         inner join sys_department t2 on t1.siteid = t2.siteid and t1.departmentid = t2.departmentid
-         left join sys_hr t3 on t1.siteid = t3.siteid and t1.reporthrid = t3.hrid
-         inner join sa_salearea_hr t4 on t1.siteid = t4.siteid and t1.hrid = t4.hrid
-         inner join sa_salearea t5 on t4.siteid = t5.siteid and t4.sa_saleareaid = t5.sa_saleareaid
-         left join sys_users t6 on t1.userid = t6.userid
-where t1.siteid = $siteid$
-  and t5.sa_saleareaid in $sa_saleareaid$ and $where$

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

@@ -91,7 +91,7 @@ public class salearea extends Controller {
                 saleAreaids.addAll(userInfo.getHrSaleAreaIds(hrid));
                 saleAreaids.add(-1L);
                 if (sa_saleareaidsList.size() > 0) {
-                    String sqlStr = " and t1.sys_enterpriseid in (SELECT DISTINCT sys_enterpriseid from sys_enterprise_tradefield WHERE sa_saleareaid in " + saleAreaids + " and hrid ='"+hrid+"' )";
+                    String sqlStr = " and t1.sys_enterpriseid in (SELECT DISTINCT sys_enterpriseid from sys_enterprise_tradefield WHERE sa_saleareaid in " + saleAreaids + " and hrid ='" + hrid + "' )";
                     sqlStr = sqlStr.replace("[", "(").replace("]", ")");
                     where.append(sqlStr);
                 }
@@ -104,7 +104,7 @@ public class salearea extends Controller {
         }
 
         SQLFactory sqlFactory = new SQLFactory(this, "查询经销商业务员");
-        sqlFactory.addParameter("siteid",siteid);
+        sqlFactory.addParameter("siteid", siteid);
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents",
                         "sa_agentsid", "sys_enterpriseid", "gmname", "gmphonenumber", "agentnum", "cooperatetype", "remarks", "status", "createdate", "scale", "mainproducts").
@@ -376,23 +376,36 @@ public class salearea extends Controller {
         }
         Long isHasSub = content.getLongValue("isHasSub");
 
-        SQLFactory sqlFactory = new SQLFactory(this, "业务员列表查询", pageSize, pageNumber, pageSorting);
-        sqlFactory.addParameter("siteid", siteid);
         ArrayList<Long> list = new ArrayList<>();
         if (isHasSub == 1) {
             list = SaleArea.getSubSaleAreaIds(this, sa_saleareaid);
         }
 
         list.add(sa_saleareaid);
-        sqlFactory.addParameter_in("sa_saleareaid", list);
-        sqlFactory.addParameter_SQL("where", where);
-        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
 
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_salearea_hr", "hrid").setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t2", "t2.sa_saleareaid=t1.sa_saleareaid and t2.siteid='" + siteid + "'",
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_hr", "t1.*").setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_department", "t2", "t1.siteid = t2.siteid and t1.departmentid = t2.departmentid",
+                "depname","depfullname");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_hr", "t3", "t1.siteid = t3.siteid and t1.reporthrid = t3.hrid");
+        querySQL.addJoinTable(JOINTYPE.inner, "sa_salearea_hr", "t4", "t1.siteid = t4.siteid and t1.hrid = t4.hrid");
+        querySQL.addJoinTable(JOINTYPE.inner, "sa_salearea", "t5", "t4.siteid = t5.siteid and t4.sa_saleareaid = t5.sa_saleareaid",
+                "sa_saleareaid","areaname","areafullname");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_users", "t6", "t1.userid = t6.userid",
+                "accountno");
+        querySQL.addQueryFields("reporthrname","t3.name");
+        querySQL.addQueryFields("userphonenumber","t6.phonenumber");
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere("t5.sa_saleareaid", list);
+        querySQL.setWhere(  where);
+        querySQL.setPage(pageSize, pageNumber);
+        Rows rows = querySQL.query();
+
+
+        QuerySQL saleareaquerySQL = SQLFactory.createQuerySQL(this, "sa_salearea_hr", "hrid").setTableAlias("t1");
+        saleareaquerySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t2", "t2.sa_saleareaid=t1.sa_saleareaid and t2.siteid='" + siteid + "'",
                 "sa_saleareaid", "areaname");
-        querySQL.setWhere("hrid", rows.toArrayList("hrid"));
-        RowsMap rowsMap = querySQL.query().toRowsMap("hrid");
+        saleareaquerySQL.setWhere("hrid", rows.toArrayList("hrid"));
+        RowsMap rowsMap = saleareaquerySQL.query().toRowsMap("hrid");
         for (Row row : rows) {
             row.put("sa_saleareas", rowsMap.get(row.getLong("hrid")));
         }