Bladeren bron

企业档案查询

shenjingwei 5 maanden geleden
bovenliggende
commit
72d4143262
1 gewijzigde bestanden met toevoegingen van 13 en 62 verwijderingen
  1. 13 62
      src/custom/restcontroller/webmanage/sale/enterprise/enterprise.java

+ 13 - 62
src/custom/restcontroller/webmanage/sale/enterprise/enterprise.java

@@ -179,62 +179,13 @@ public class enterprise extends Controller {
                 sql = sql.replace("[", "(").replace("]", ")");
                 where.append(sql);
             }
-
-//            if (whereObject.containsKey("typemx") && !"".equals(whereObject.getString("typemx"))) {
-//                String typemx = whereObject.getString("typemx");
-//                String sql = "";
-//                boolean issaler = isSaler();
-//
-//
-//                //经销商
-//                if (typemx.equals("经销商合作协议") || typemx.equals("经销项目协议") || typemx.equals("工具使用(借用)协议")) {
-//                    if (issaler) {
-//                        Rows rows = dbConnect.runSqlQuery("select sys_enterpriseid from sys_enterprise where sys_enterpriseid in (select t2.sys_enterpriseid from sys_departmenthrid t1 left join sys_enterprise_tradefield t2 "
-//                                + "on t1.siteid=t2.siteid and t1.hrid=t2.hrid where (t1.departmentid in(with recursive department as (select departmentid from sys_department where siteid = '" + siteid + "' and departmentid = " + departmentid
-//                                + " union all select t2.departmentid from department t1 inner join sys_department t2 on t1.departmentid = t2.parentid and t2.siteid ='" + siteid + "') select departmentid from department where departmentid !='" + departmentid + "') "
-//                                + " or if((select isleader from sys_hr where userid=" + userid + ")=1,t1.departmentid=" + departmentid + ",1=2) or t1.hrid=(select hrid from sys_hr where userid=" + userid + "))) UNION ALL select 0");
-//                        if (StringUtils.isNotEmpty(whereObject.getString("type")) && whereObject.getLong("type") > 0) {
-//                            sql = " or (t1.sys_enterpriseid in  " + rows.toArrayList("sys_enterpriseid", new ArrayList<>()) + "))";
-//                        } else {
-//                            sql = " and (t1.sys_enterpriseid in  " + rows.toArrayList("sys_enterpriseid", new ArrayList<>()) + ")";
-//                        }
-//                    }
-//                }
-//                //客户
-//                if (typemx.equals("直销项目协议") || typemx.equals("工具使用(借用)协议")) {
-//                    if (issaler) {
-//                        //Rows rows = dbConnect.runSqlQuery("select t2.sys_enterpriseid from sys_datateam t1 left join sa_customers t2 on t1.ownerid=t2.sa_customersid and t1.siteid=t2.siteid and t1.ownertable='sa_customers'  where t1.userid=" + userid + " and t1.siteid='" + siteid + "' and t2.sys_enterpriseid is not null UNION ALL select 0 ");
-////                    	  Rows rows = dbConnect.runSqlQuery("select sys_enterpriseid from sa_customers where sys_enterpriseid in (select t2.sys_enterpriseid from sys_departmenthrid t1 left join sys_datateam t2 "
-////                          		+ "on t1.siteid=t2.siteid and t1.hrid=t2.hrid where (t1.departmentid in(with recursive department as (select departmentid from sys_department where siteid = '"+siteid+"' and departmentid = "+departmentid
-////                          		+ " union all select t2.departmentid from department t1 inner join sys_department t2 on t1.departmentid = t2.parentid and t2.siteid ='"+siteid+"') select departmentid from department where departmentid !='"+departmentid+"') "
-////                          		+ " or if((select isleader from sys_hr where userid="+userid+")=1,t1.departmentid="+departmentid+",1=2) or t1.hrid=(select hrid from sys_hr where userid="+userid+"))) UNION ALL select 0");
-//
-//                        if (whereObject.containsKey("type") && StringUtils.isNotEmpty(whereObject.getString("type"))) {
-//                            sql = " or (t1.sys_enterpriseid in  " + Hr.getCustomers(this, hrid) + "))";
-//                        } else {
-//                            sql = " and (t1.sys_enterpriseid in  " + Hr.getCustomers(this, hrid) + ")";
-//                        }
-//                    }
-//                }
-//                if (StringUtils.isEmpty(sql)) {
-//                    sql = ")";
-//                }
-//                sql = sql.replace("[", "(").replace("]", ")");
-//                where.append(sql);
-//            }
         }
-//        SQLFactory sqlFactory = new SQLFactory(this, "商户档案列表查询", pageSize, pageNumber, pageSorting);
-//        sqlFactory.addParameter_SQL("where", where);
-//        sqlFactory.addParameter("siteid", siteid);
-//        String sql = sqlFactory.getSQL();
-//        Rows rows = dbConnect.runSqlQuery(sql);
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise", "siteid", "sys_enterpriseid",
-                "createby","createdate","changeby","changedate","city","county","address","phonenumber","province","contact","enterprisename","taxno","limitreturnday",
-                "freefreightamount","latitude","longitude","invoicingpoint","saleclassauth","grade","isorder");
+                "createby", "createdate", "changeby", "changedate", "city", "county", "address", "phonenumber", "province", "contact", "enterprisename", "taxno", "limitreturnday",
+                "freefreightamount", "latitude", "longitude", "invoicingpoint", "saleclassauth", "grade", "isorder");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid and t1.siteid = t2.siteid","sa_customersid","type");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.siteid = t3.siteid and t1.sys_enterpriseid = t3.sys_enterpriseid","agentnum");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t9", "t1.sys_enterpriseid = t9.ownerid  and ownertable='sys_enterprise' and  t1.siteid = t9.siteid","erpagentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t1.siteid = t3.siteid and t1.sys_enterpriseid = t3.sys_enterpriseid", "agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t9", "t1.sys_enterpriseid = t9.ownerid  and ownertable='sys_enterprise' and  t1.siteid = t9.siteid", "erpagentnum");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
@@ -330,9 +281,9 @@ public class enterprise extends Controller {
 //        String sql = sqlFactory.getSQL();
 //        Rows rows = dbConnect.runSqlQuery(sql);
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise", "siteid", "sys_enterpriseid",
-                "phonenumber","contact","enterprisename");
+                "phonenumber", "contact", "enterprisename");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid","agentnum");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid", "agentnum");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t2.status='启用'");
         querySQL.setWhere(where.toString());
@@ -376,10 +327,10 @@ public class enterprise extends Controller {
 //        sqlFactory.addParameter("siteid", siteid);
 //        String sql = sqlFactory.getSQL();
 //        Rows rows = dbConnect.runSqlQuery(sql);
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_customers",  "siteid",
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_customers", "siteid",
                 "sys_enterpriseid");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid and t1.siteid = t2.siteid","phonenumber","enterprisename","contact");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t1.sys_enterpriseid = t2.sys_enterpriseid and t1.siteid = t2.siteid", "phonenumber", "enterprisename", "contact");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.datastatus!=1");
         querySQL.setWhere(where.toString());
@@ -573,7 +524,7 @@ public class enterprise extends Controller {
 
 //            SQLFactory sqlFactory = new SQLFactory("select * from sys_userrequestlog where userid!=0 and userid in $userid$");
 //            sqlFactory.addParameter_in("userid", useridlist);
-            Rows logRows = dbConnect.runSqlQuery("select * from sys_userrequestlog where userid!=0 and userid in "+useridlist.toString().replace("[", "(").replace("]", ")"));
+            Rows logRows = dbConnect.runSqlQuery("select * from sys_userrequestlog where userid!=0 and userid in " + useridlist.toString().replace("[", "(").replace("]", ")"));
             if (logRows.isNotEmpty()) {
                 batchDeleteErr.addErr(sys_enterpriseid, "该商户下属账号存在访问记录,不可进行删除操作");
                 continue;
@@ -595,17 +546,17 @@ public class enterprise extends Controller {
                 {
                     //SQLFactory deletesql = new SQLFactory("sql:delete from sys_users where userid in $userid$");
                     //deletesql.addParameter_in("userid", useridlist);
-                    list.add("delete from sys_users where userid in"+useridlist.toString().replace("[", "(").replace("]", ")"));
+                    list.add("delete from sys_users where userid in" + useridlist.toString().replace("[", "(").replace("]", ")"));
                 }
                 {
 //                    SQLFactory deletesql = new SQLFactory("sql:delete from sys_usersite where userid in $userid$");
 //                    deletesql.addParameter_in("userid", useridlist);
-                    list.add("delete from sys_usersite where userid in "+useridlist.toString().replace("[", "(").replace("]", ")"));
+                    list.add("delete from sys_usersite where userid in " + useridlist.toString().replace("[", "(").replace("]", ")"));
                 }
                 {
 //                    SQLFactory deletesql = new SQLFactory("sql:delete from sys_userrole where userid in $userid$");
 //                    deletesql.addParameter_in("userid", useridlist);
-                    list.add("delete from sys_userrole where userid in "+useridlist.toString().replace("[", "(").replace("]", ")"));
+                    list.add("delete from sys_userrole where userid in " + useridlist.toString().replace("[", "(").replace("]", ")"));
                 }
             }
             dbConnect.runSqlUpdate(list);
@@ -636,7 +587,7 @@ public class enterprise extends Controller {
 
         Rows agentRows = dbConnect.runSqlQuery("select agentnum from sa_agents where siteid='" + siteid + "' and sys_enterpriseid=" + sys_enterpriseid);
         if (agentRows.isEmpty()) {
-            User.createUser(this, sys_enterpriseid, enterprisename, phonenumber, true, "负责人", 21,  ArrayUtils.toPrimitive(defaultroleids), enterprisename);
+            User.createUser(this, sys_enterpriseid, enterprisename, phonenumber, true, "负责人", 21, ArrayUtils.toPrimitive(defaultroleids), enterprisename);
         } else {
             String accountprefix = Parameter.getString(siteid, "accountprefix");
             User.createUser(this, sys_enterpriseid, accountprefix + "" + agentRows.get(0).getString("agentnum"), enterprisename, phonenumber, true, "负责人", 21, ArrayUtils.toPrimitive(defaultroleids), enterprisename);