线索查询优化

src/custom/restcontroller/sale/enterprise/enterprise.java

@@ -33,7 +33,7 @@ public class enterprise extends Controller {
                 sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
             }
         }
-        if(sys_enterpriseid==0){
+        if (sys_enterpriseid == 0) {
             return getSucReturnObject().setData(new Row()).toString();
         }
 
@@ -169,13 +169,12 @@ public class enterprise extends Controller {
             long sys_enterprise_bankid = Long.parseLong(o.toString());
 
             ArrayList<String> list = new ArrayList<>();
-            String deletesql ="delete from sys_enterprise_bank where sys_enterprise_bankid=" + sys_enterprise_bankid;
+            String deletesql = "delete from sys_enterprise_bank where sys_enterprise_bankid=" + sys_enterprise_bankid;
             list.add(deletesql);
 
             dbConnect.runSqlUpdate(list);
         }
         return batchDeleteErr.getReturnObject().toString();
-
-
     }
+
 }

src/custom/restcontroller/sale/team/team.java

@@ -47,14 +47,14 @@ public class team extends Controller {
 //        Rows hrrows = dbConnect.runSqlQuery(sqlFactory.getSQL());
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_hr", "sys_enterprise_hrid", "name",
-                "position","isleader","phonenumber","remarks","email","userid");
+                "position", "isleader", "phonenumber", "remarks", "email", "userid", "authmodel", "isagent");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.inner, "sys_users", "t2", "t1.userid = t2.userid and t2.status!='DELETED'","accountno");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_users", "t2", "t1.userid = t2.userid and t2.status!='DELETED'", "accountno");
         querySQL.addJoinTable(JOINTYPE.left, "sys_usertrialperiod", "t4", "t4.userid=t1.userid and t4.siteid=t1.siteid");
-        querySQL.addQueryFields("begdate","ifnull(t4.begdate, '')");
-        querySQL.addQueryFields("enddate","ifnull(t4.enddate, '')");
+        querySQL.addQueryFields("begdate", "ifnull(t4.begdate, '')");
+        querySQL.addQueryFields("enddate", "ifnull(t4.enddate, '')");
         querySQL.setSiteid(siteid);
-        querySQL.setWhere("t1.sys_enterpriseid",sys_enterpriseid);
+        querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
         Rows hrrows = querySQL.query();
@@ -204,9 +204,9 @@ public class team extends Controller {
         if (!rows.isEmpty()) {
             for (Row row : rows) {
                 long userid = row.getLong("userid");
-                Rows userroleRows= dbConnect.runSqlQuery("select t1.*,t2.rolename from sys_userrole t1 inner join  sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t1.userid="+userid);
-                if(userroleRows.isNotEmpty()){
-                    if(userroleRows.get(0).getString("rolename").equals("经销商")){
+                Rows userroleRows = dbConnect.runSqlQuery("select t1.*,t2.rolename from sys_userrole t1 inner join  sys_role t2 on t1.roleid=t2.roleid and t1.siteid=t2.siteid where t1.userid=" + userid);
+                if (userroleRows.isNotEmpty()) {
+                    if (userroleRows.get(0).getString("rolename").equals("经销商")) {
                         return getErrReturnObject().setErrMsg("团队负责人账号禁止删除").toString();
                     }
                 }
@@ -259,14 +259,48 @@ public class team extends Controller {
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_payorderitems", "enddate");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.inner, "sys_payorder", "t2", "t2.sys_payorderid = t1.sys_payorderid and t2.siteid = t1.siteid","ispaid");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_site_systempartition", "t3", "t3.sys_site_systempartitionid = t2.sys_site_systempartitionid and t3.siteid = t2.siteid","partitionname");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_payorder", "t2", "t2.sys_payorderid = t1.sys_payorderid and t2.siteid = t1.siteid", "ispaid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_site_systempartition", "t3", "t3.sys_site_systempartitionid = t2.sys_site_systempartitionid and t3.siteid = t2.siteid", "partitionname");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t2.ispaid = 1 and CURRENT_TIME <= t1.enddate");
-        querySQL.setWhere("t1.userid",userid);
+        querySQL.setWhere("t1.userid", userid);
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
         return getSucReturnObject().setData(rows).toString();
     }
+
+
+    @API(title = "修改销售线索分配模式")
+    public String changeAgentModel() throws YosException {
+        Long authmodel = content.getLong("authmodel");
+        Long sys_enterprise_hrid = content.getLongValue("sys_enterprise_hrid");
+
+        ArrayList<String> sqlList = new ArrayList<>();
+        sqlList.add("UPDATE sys_enterprise_hr SET authmodel=" + authmodel + " WHERE sys_enterpriseid = " + sys_enterpriseid + " and siteid = '" + siteid + "'");
+        if (authmodel == 3) {
+            sqlList.add("UPDATE sys_enterprise_hr SET isagent = 0 WHERE sys_enterpriseid = " + sys_enterpriseid + " and siteid = '" + siteid + "'");
+            sqlList.add("UPDATE sys_enterprise_hr SET isagent = 1 WHERE sys_enterprise_hrid = " + sys_enterprise_hrid + " and siteid = '" + siteid + "'");
+        }
+        dbConnect.runSqlUpdate(sqlList);
+        return getSucReturnObject().toString();
+    }
+
+    @API(title = "获取销售线索分配模式")
+    public String getAgentModel() throws YosException {
+        Long sys_enterpriseid = content.getLong("sys_enterpriseid");
+        Row row = new Row();
+        Rows rows = dbConnect.runSqlQuery("SELECT authmodel from sys_enterprise_hr WHERE sys_enterpriseid = " + sys_enterpriseid + " and siteid = '" + siteid + "'");
+        if (rows.isNotEmpty()) {
+            row.put("authmodel", rows.get(0).getLong("authmodel"));
+        } else {
+            row.put("authmodel", 1);
+        }
+        rows = dbConnect.runSqlQuery("SELECT * from sys_enterprise_hr WHERE sys_enterpriseid = " + sys_enterpriseid + " and isagent=1 and siteid = '" + siteid + "'");
+        if (rows.isNotEmpty()) {
+            rows.get(0).put("headpic", getHeadPic(rows.get(0).getLong("userid")));
+            row.put("sys_enterprise_hrid", rows.get(0));
+        }
+        return getSucReturnObject().setData(row).toString();
+    }
 }

src/custom/restcontroller/saletool/orderclue/web/orderclue.java

@@ -58,12 +58,20 @@ public class orderclue extends Controller {
         if (usertype == 1) {
             sat_orderclueids = SQLFactory.createQuerySQL(this, "sat_orderclue_auth", "sat_orderclueid").setWhere("sys_enterpriseid", sys_enterpriseid).query().toArrayList("sat_orderclueid", new ArrayList<>());
         } else {
-            if (isleader) {
+            Row enterpriseHrRow = userInfo.getEnterprise_HrRow();
+            long sys_enterprise_hrid = enterpriseHrRow.getLong("sys_enterprise_hrid");
+            boolean isagent = enterpriseHrRow.getBoolean("isagent");
+            int authmodel = enterpriseHrRow.getInteger("authmodel");
+
+            //查询经销商老板还是经销商团队成员
+            if (isleader || (authmodel == 3 && isagent)) {
                 sat_orderclueids.addAll(getLeaderIds());
             } else {
-                sat_orderclueids.addAll(getSalesIds(getEnterpriseHr(userid).getLong("sys_enterprise_hrid")));
+                sat_orderclueids.addAll(getSalesIds(sys_enterprise_hrid));
+            }
+            if (authmodel == 1) {
+                sat_orderclueids.addAll(getFollowIds());
             }
-            sat_orderclueids.addAll(getFollowIds());
         }
 
         //用来判断是否是成员跟进
@@ -145,18 +153,26 @@ public class orderclue extends Controller {
 
     @API(title = "线索池-web-根据状态查询线索数量", apiversion = R.ID2026020914460801.v1.class)
     public String getCount() throws YosException {
-        ArrayList<Long> ids = new ArrayList<>();
+        ArrayList<Long> sat_orderclueids = new ArrayList<>();
         //查询经销商老板还是经销商团队成员
-        if (isleader) {
-            ids.addAll(getLeaderIds());
+        Row enterpriseHrRow = userInfo.getEnterprise_HrRow();
+        long sys_enterprise_hrid = enterpriseHrRow.getLong("sys_enterprise_hrid");
+        boolean isagent = enterpriseHrRow.getBoolean("isagent");
+        int authmodel = enterpriseHrRow.getInteger("authmodel");
+
+        //查询经销商老板还是经销商团队成员
+        if (isleader || (authmodel == 3 && isagent)) {
+            sat_orderclueids.addAll(getLeaderIds());
         } else {
-            ids.addAll(getSalesIds(getEnterpriseHr(userid).getLong("sys_enterprise_hrid")));
+            sat_orderclueids.addAll(getSalesIds(sys_enterprise_hrid));
+        }
+        if (authmodel == 1) {
+            sat_orderclueids.addAll(getFollowIds());
         }
-        ids.addAll(getFollowIds());
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sat_orderclue");
         querySQL.addQueryFields("num", "count(0)");
         querySQL.setWhere("status", new String[]{"待跟进", "跟进中"});
-        querySQL.setWhere("sat_orderclueid", ids);
+        querySQL.setWhere("sat_orderclueid", sat_orderclueids);
         Rows rows = querySQL.query();
         JSONObject resObj = new JSONObject();
         resObj.put("count", rows.get(0).getString("num"));

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

@@ -6,29 +6,27 @@ import beans.datacontrllog.DataContrlLog;
 import beans.dataextend.DataExtend;
 import beans.datatag.DataTag;
 import beans.datateam.DataTeam;
-import beans.enterprise.Enterprise;
 import beans.salearea.SaleArea;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import common.Controller;
 import common.YosException;
-import common.annotation.*;
+import common.annotation.API;
+import common.annotation.CACHEING;
+import common.annotation.CACHEING_CLEAN;
+import common.annotation.cm;
 import common.data.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.DataFormat;
 import org.apache.poi.xssf.usermodel.*;
 import restcontroller.R;
-import restcontroller.sale.stockbill.stockbill;
 import restcontroller.webmanage.executorService.Executor;
 import restcontroller.webmanage.sale.bankabcxccard.bankabcxccard;
 import restcontroller.webmanage.sale.customer.Customer;
 import restcontroller.webmanage.sale.enterprisesaleclass.EnterpriseSaleClass;
 import restcontroller.webmanage.sale.enterprisetradefield.EnterpriseTradeField;
-import restcontroller.webmanage.sale.expressform.expressform;
 import restcontroller.webmanage.sale.salearea.salearea;
-import restcontroller.webmanage.sale.tpartreimbursement.tpartreimbursement;
-import restcontroller.webmanage.sale.tpartreimbursement.tpartreimbursementdetail;
 import restcontroller.webmanage.sale.warrantycard.warrantycard;
 
 import java.math.BigDecimal;
@@ -1234,4 +1232,5 @@ public class agents extends Controller {
             return numberStr;
         }
     }
+
 }