调整

src/custom/beans/CommonHepler.java

@@ -0,0 +1,34 @@
+package beans;
+
+import common.Controller;
+import common.YosException;
+import common.data.RowsMap;
+
+import java.util.ArrayList;
+
+public class CommonHepler {
+    public static RowsMap getAreaRowsMap(Controller controller, ArrayList<Long> sa_agentsids) throws YosException {
+        if (sa_agentsids.size() == 0) {
+            return new RowsMap();
+        }
+        String sql = "SELECT DISTINCT t2.areaname,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
+                "INNER JOIN sa_salearea t2 ON t2.sa_saleareaid=t1.sa_saleareaid " +
+                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
+        sql = sql.replace("[", "(").replace("]", ")");
+
+        return controller.dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
+    }
+
+
+    public static RowsMap getSalerNameRowsMap(Controller controller, ArrayList<Long> sa_agentsids) throws YosException {
+        if (sa_agentsids.size() == 0) {
+            return new RowsMap();
+        }
+        String sql = "SELECT DISTINCT t2.name,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
+                "INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid " +
+                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
+        sql = sql.replace("[", "(").replace("]", ")");
+
+        return controller.dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
+    }
+}

src/custom/restcontroller/sale/customer/Hospital.java

@@ -1,5 +1,6 @@
 package restcontroller.sale.customer;
 
+import beans.CommonHepler;
 import beans.brand.Brand;
 import beans.datacontrllog.DataContrlLog;
 import beans.dataextend.DataExtend;
@@ -756,8 +757,8 @@ public class Hospital extends Controller {
         querySQL.setOrderBy("t1.createdate desc");
         Rows rows = querySQL.query();
 
-        RowsMap areaRowsMap = getAreaRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
-        RowsMap salerRowsMap = getSalerNameRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap areaRowsMap = CommonHepler.getAreaRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap salerRowsMap = CommonHepler.getSalerNameRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
         for (Row row : rows) {
             row.put("p_c_c", row.getString("province") + "-" + row.getString("city") + "-" + row.getString("county"));
             Rows areaRows = areaRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());
@@ -770,31 +771,6 @@ public class Hospital extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
-    public RowsMap getAreaRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-        if (sa_agentsids.size() == 0) {
-            return new RowsMap();
-        }
-
-        String sql = "SELECT DISTINCT t2.areaname,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sa_salearea t2 ON t2.sa_saleareaid=t1.sa_saleareaid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
-
-    public RowsMap getSalerNameRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-        if (sa_agentsids.size() == 0) {
-            return new RowsMap();
-        }
-        String sql = "SELECT DISTINCT t2.name,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
-
     @API(title = "添加经销商", apiversion = R.ID2025102713181402.v1.class)
     public String addAgents() throws YosException {
 
@@ -881,8 +857,8 @@ public class Hospital extends Controller {
         querySQL.setOrderBy("t1.createdate desc");
         Rows rows = querySQL.query();
 
-        RowsMap areaRowsMap = getAreaRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
-        RowsMap salerRowsMap = getSalerNameRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap areaRowsMap = CommonHepler.getAreaRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap salerRowsMap = CommonHepler.getSalerNameRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
         for (Row row : rows) {
             row.put("p_c_c", row.getString("province") + "-" + row.getString("city") + "-" + row.getString("county"));
             Rows areaRows = areaRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());

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

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.sale.agents;
 
+import beans.CommonHepler;
 import beans.accountbalance.Accountbalance;
 import beans.data.BatchDeleteErr;
 import beans.datacontrllog.DataContrlLog;
@@ -100,8 +101,8 @@ public class agents extends Controller {
         sqlFactory.addParameter("sa_agentsid", sa_agentsid);
         sqlFactory.addParameter("siteid", siteid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
-        RowsMap areaRowsMap = getAreaRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
-        RowsMap salerRowsMap = getSalerNameRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap areaRowsMap = CommonHepler.getAreaRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap salerRowsMap = CommonHepler.getSalerNameRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
         for (Row row : rows) {
             row.put("hrs", getEnterpriseHrs(row.getLong("sys_enterpriseid")));
             Rows areaRows = areaRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());
@@ -114,26 +115,6 @@ public class agents extends Controller {
         return getSucReturnObject().setData(rows.isNotEmpty() ? rows.get(0) : new Row()).toString();
     }
 
-    public RowsMap getAreaRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-
-        String sql = "SELECT DISTINCT t2.areaname,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sa_salearea t2 ON t2.sa_saleareaid=t1.sa_saleareaid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
-
-    public RowsMap getSalerNameRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-
-        String sql = "SELECT DISTINCT t2.name,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
-
 
     @API(title = "经销商新增修改", apiversion = R.ID2025102310145302.v1.class, intervaltime = 2000)
     @CACHEING_CLEAN(cms = {@cm(clazz = agents.class, method = {"query_agentList", "query_agentMain"}), @cm(clazz = salearea.class, method = {"query_agent"}), @cm(clazz = salearea.class, method = {"query_agent"})},

src/custom/restcontroller/webmanage/sale/contract/Contract2.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.sale.contract;
 
+import beans.CommonHepler;
 import beans.datacontrllog.DataContrlLog;
 import beans.dataextend.DataExtend;
 import beans.datatag.DataTag;
@@ -445,8 +446,8 @@ public class Contract2 extends Controller {
         querySQL.setOrderBy("t1.createdate desc");
         Rows rows = querySQL.query();
 
-        RowsMap areaRowsMap = getAreaRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
-        RowsMap salerRowsMap = getSalerNameRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap areaRowsMap = CommonHepler.getAreaRowsMap(this,rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap salerRowsMap = CommonHepler.getSalerNameRowsMap(this,rows.toArrayList("sa_agentsid", new ArrayList<>()));
         for (Row row : rows) {
             row.put("p_c_c", row.getString("province") + "-" + row.getString("city") + "-" + row.getString("county"));
             Rows areaRows = areaRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());
@@ -459,31 +460,6 @@ public class Contract2 extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
-    public RowsMap getAreaRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-        if (sa_agentsids.size() == 0) {
-            return new RowsMap();
-        }
-
-        String sql = "SELECT DISTINCT t2.areaname,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sa_salearea t2 ON t2.sa_saleareaid=t1.sa_saleareaid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
-
-    public RowsMap getSalerNameRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-        if (sa_agentsids.size() == 0) {
-            return new RowsMap();
-        }
-        String sql = "SELECT DISTINCT t2.name,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
-
     @API(title = "校验合同", apiversion = R.ID2025102416540802.v1.class)
     public String checkContract() throws YosException {
         Long sa_customersid = content.getLongValue("sa_customersid");

src/custom/restcontroller/webmanage/sale/order/Order2.java

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.sale.order;
 
+import beans.CommonHepler;
 import beans.accountbalance.Accountbalance;
 import beans.datacontrllog.DataContrlLog;
 import beans.dataextend.DataExtend;
@@ -566,30 +567,6 @@ public class Order2 extends Controller {
         return rows.toRowsMap("sa_customersid");
     }
 
-    public RowsMap getAreaRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-        if (sa_agentsids.size() == 0) {
-            return new RowsMap();
-        }
-
-        String sql = "SELECT DISTINCT t2.areaname,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sa_salearea t2 ON t2.sa_saleareaid=t1.sa_saleareaid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
-
-    public RowsMap getSalerNameRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-        if (sa_agentsids.size() == 0) {
-            return new RowsMap();
-        }
-        String sql = "SELECT DISTINCT t2.name,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
 
     @API(title = "经销商列表", apiversion = R.ID2025102814092602.v1.class)
     public String agentsList() throws YosException {
@@ -637,7 +614,7 @@ public class Order2 extends Controller {
         querySQL.setOrderBy("t1.createdate desc");
         Rows rows = querySQL.query();
 
-        RowsMap areaRowsMap = getAreaRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap areaRowsMap = CommonHepler.getAreaRowsMap(this,rows.toArrayList("sa_agentsid", new ArrayList<>()));
         for (Row row : rows) {
             Rows areaRows = areaRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());
             row.put("areanames", StringUtils.join(areaRows.toArrayList("areaname"), ","));

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

@@ -1,5 +1,6 @@
 package restcontroller.webmanage.sale.salearea;
 
+import beans.CommonHepler;
 import beans.salearea.SaleArea;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -111,8 +112,8 @@ public class salearea2 extends Controller {
         querySQL.setOrderBy("t1.createdate desc");
         Rows rows = querySQL.query();
 
-        RowsMap areaRowsMap = getAreaRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
-        RowsMap salerRowsMap = getSalerNameRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap areaRowsMap = CommonHepler.getAreaRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
+        RowsMap salerRowsMap = CommonHepler.getSalerNameRowsMap(this, rows.toArrayList("sa_agentsid", new ArrayList<>()));
         for (Row row : rows) {
             row.put("p_c_c", row.getString("province") + "-" + row.getString("city") + "-" + row.getString("county"));
             Rows areaRows = areaRowsMap.getOrDefault(row.getString("sa_agentsid"), new Rows());
@@ -125,29 +126,5 @@ public class salearea2 extends Controller {
         return getSucReturnObject().setData(rows).toString();
     }
 
-    public RowsMap getAreaRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-        if (sa_agentsids.size() == 0) {
-            return new RowsMap();
-        }
-
-        String sql = "SELECT DISTINCT t2.areaname,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sa_salearea t2 ON t2.sa_saleareaid=t1.sa_saleareaid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
-
-    public RowsMap getSalerNameRowsMap(ArrayList<Long> sa_agentsids) throws YosException {
-        if (sa_agentsids.size() == 0) {
-            return new RowsMap();
-        }
-        String sql = "SELECT DISTINCT t2.name,t1.sa_agentsid from sys_enterprise_tradefield t1 " +
-                "INNER JOIN sys_hr t2 ON t2.hrid=t1.hrid " +
-                "WHERE t1.siteid='YOSTEST1' and t1.sa_agentsid in " + sa_agentsids;
-        sql = sql.replace("[", "(").replace("]", ")");
-
-        return dbConnect.runSqlQuery(sql).toRowsMap("sa_agentsid");
-    }
 
 }