bug修复

src/custom/restcontroller/R.java

@@ -7322,6 +7322,11 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2025102409284502 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/prsx/doctor/doctor.java

@@ -34,7 +34,7 @@ public class doctor extends Controller {
         ArrayList<String> sqlList = new ArrayList<>();
         Long sa_doctorid = content.getLongValue("sa_doctorid");
         Long sa_hospitaldepid = content.getLongValue("sa_hospitaldepid");
-        Rows rows = dbConnect.runSqlQuery("SELECT * from sa_hospitaldep WHERE sa_hospitaldepid=4 and siteid='" + siteid + "'");
+        Rows rows = dbConnect.runSqlQuery("SELECT * from sa_hospitaldep WHERE sa_hospitaldepid="+sa_hospitaldepid+" and siteid='" + siteid + "'");
         Long sa_customersid = rows.isNotEmpty() ? rows.get(0).getLong("sa_customersid") : 0;
 
         if (sa_doctorid <= 0) {

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

@@ -194,6 +194,12 @@ public class Hospital extends Controller {
             }
         }
 
+        if(content.containsKey("sa_agentsid")){
+            InsertSQL insertSQL=SQLFactory.createInsertSQL(this, "sa_agents_hospital");
+            insertSQL.setSiteid(siteid);
+
+        }
+
         return selectDetail();
     }
 

src/custom/restcontroller/webmanage/sale/enterprisetradefield/EnterpriseTradeField.java

@@ -31,12 +31,11 @@ public class EnterpriseTradeField extends Controller {
         Long sys_enterprise_tradefieldid = content.getLongValue("sys_enterprise_tradefieldid");
         Long sys_enterpriseid = content.getLong("sys_enterpriseid");
         Long sa_agentsid = content.getLong("sa_agentsid");
-        String tradefield = content.getString("tradefield");
-        String tradefieldmx = content.getStringValue("tradefieldmx");
+
         Long sa_saleareaid = content.getLong("sa_saleareaid");
         Long hrid = content.getLong("hrid");
 
-        String sql = "SELECT 1 from sys_enterprise_tradefield WHERE sys_enterpriseid = " + sys_enterpriseid + " and siteid ='" + siteid + "' and tradefield = '" + tradefield + "' and sa_saleareaid=" + sa_saleareaid + " and tradefieldmx ='" + tradefieldmx + "' and hrid = " + hrid;
+        String sql = "SELECT 1 from sys_enterprise_tradefield WHERE sys_enterpriseid = " + sys_enterpriseid + " and siteid ='" + siteid + "' and sa_saleareaid=" + sa_saleareaid + " and hrid = " + hrid;
 
         if (dbConnect.runSqlQuery(sql).isNotEmpty()) {
             return getReturnObject().setCode("0237", new String[0]).toString();//当前数据已存在，无法添加或更新。
@@ -54,44 +53,22 @@ public class EnterpriseTradeField extends Controller {
 
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("userid", userid);
-        sqlFactory.addParameter("tradefield", tradefield);
-        sqlFactory.addParameter("tradefieldmx", tradefieldmx);
         sqlFactory.addParameter("sa_saleareaid", sa_saleareaid);
         sqlFactory.addParameter("hrid", hrid);
         sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
         sqlFactory.addParameter("sa_agentsid", sa_agentsid);
         sqlFactory.addParameter("sys_enterprise_tradefieldid", sys_enterprise_tradefieldid);
         sqlList.add(sqlFactory.getSQL());
-        sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "授权领域", "授权领域：" + tradefield + "，业务员：" + name).getSQL());
+        sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "新增授权", "新增授权业务员：" + name).getSQL());
         dbConnect.runSqlUpdate(sqlList);
 
         sqlList = new ArrayList<>();
-        //给对应的客户添加负责人或参与人
-        Rows rows = dbConnect.runSqlQuery("SELECT sa_customersid from sa_customers WHERE siteid = '" + siteid + "' and sys_enterpriseid=" + sys_enterpriseid);
-        if (rows.isNotEmpty()) {
-            Long sa_customersid = rows.get(0).getLong("sa_customersid");
-            //查询是否存在负责人
-            Rows teamRows = dbConnect.runSqlQuery("SELECT * from sys_datateam WHERE ownertable='sa_customers'  and siteid = '" + siteid + "' and isleader =1 and ownerid = '" + sa_customersid + "'");
-            Rows userRows;
-            if (teamRows.isNotEmpty()) {
-                //存在负责人，把负责人以外的人作为参与人加入到团队中区，
-                Long userid = teamRows.get(0).getLong("userid");
-                userRows = dbConnect.runSqlQuery("SELECT userid FROM sys_hr WHERE hrid IN (SELECT hrid FROM sys_enterprise_tradefield WHERE sys_enterpriseid=" + sys_enterpriseid + " AND siteid='" + siteid + "') AND userid !=" + userid + " AND siteid='" + siteid + "'");
-            } else {
-                userRows = dbConnect.runSqlQuery("SELECT userid FROM sys_hr WHERE hrid IN (SELECT hrid FROM sys_enterprise_tradefield WHERE sys_enterpriseid=" + sys_enterpriseid + " AND siteid='" + siteid + "'  ORDER BY sys_enterprise_tradefieldid) AND siteid='" + siteid + "'");
-            }
-            for (Row row : userRows) {
-                sqlList.addAll(DataTeam.createTeamSQL(this, "sa_customers", sa_customersid, row.getLong("userid")));
-            }
 
-            sqlList.add("UPDATE sa_customers SET sa_customerpoolid=0 WHERE sa_customersid= " + sa_customersid + " and siteid='" + siteid + "' ");
-
-        }
 
 
         dbConnect.runSqlUpdate(sqlList);
 
-        return queryList();
+        return queryList2();
     }
 
     @API(title = "删除", apiversion = R.ID20221223141702.v1.class)
@@ -104,7 +81,7 @@ public class EnterpriseTradeField extends Controller {
         sqlFactory.addParameter_in("sys_enterprise_tradefieldid", jsonArray.toArray());
         sqlFactory.addParameter("siteid", siteid);
 
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_tradefield", "tradefield");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_tradefield", "*");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_hr", "t2", "t1.siteid=t2.siteid and t1.hrid=t2.hrid", "name");
         querySQL.addJoinTable(JOINTYPE.inner, "sa_agents", "t3", "t1.siteid=t3.siteid and t1.sys_enterpriseid=t3.sys_enterpriseid", "sa_agentsid");
@@ -112,31 +89,11 @@ public class EnterpriseTradeField extends Controller {
         querySQL.setWhere("sys_enterprise_tradefieldid", jsonArray.toArray());
         Rows query = querySQL.query();
         for (Row row : query) {
-            String tradefield = row.getString("tradefield");
             String name = row.getString("name");
             long sa_agentsid = row.getLong("sa_agentsid");
-            sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "授权领域", "授权领域：" + tradefield + "，业务员：" + name).getSQL());
+            sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "删除授权", "删除授权业务员：" + name).getSQL());
 
         }
-//        //删除团队成员
-//        for (Object obj : jsonArray) {
-//            Long sys_enterprise_tradefieldid = Long.parseLong(obj.toString());
-//            Rows rows = dbConnect.runSqlQuery("SELECT * from sys_enterprise_tradefield WHERE sys_enterprise_tradefieldid = " + sys_enterprise_tradefieldid + " and siteid='" + siteid + "'");
-//            if (rows.isNotEmpty()) {
-//                Long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
-//                Long hrid = rows.get(0).getLong("hrid");
-//                Rows customersRows = dbConnect.runSqlQuery("SELECT sa_customersid from sa_customers WHERE siteid = '" + siteid + "' and sys_enterpriseid=" + sys_enterpriseid);
-//                Rows userRows = dbConnect.runSqlQuery("SELECT userid from sys_hr WHERE hrid=" + hrid + " and siteid='" + siteid + "'");
-//                if (customersRows.isNotEmpty()) {
-//                    Long sa_customersid = customersRows.get(0).getLong("sa_customersid");
-//                    if (userRows.isNotEmpty()) {
-//                        Long userid = userRows.get(0).getLong("userid");
-//                        DataTeam.deleteTeam(this, "sa_customers", sa_customersid, userid);
-//                    }
-//
-//                }
-//            }
-//        }
         sqlList.add(sqlFactory.getSQL());
         dbConnect.runSqlUpdate(sqlList);
 
@@ -196,38 +153,23 @@ public class EnterpriseTradeField extends Controller {
 
     @API(title = "查询企业授权列表", apiversion = R.ID2025061911194602.v1.class)
     public String queryList2() throws YosException {
-           /*
-          过滤条件设置
-         */
-        StringBuffer where = new StringBuffer(" 1=1 ");
-        if (content.containsKey("where")) {
-            JSONObject whereObject = content.getJSONObject("where");
-            if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
-                where.append(" and(");
-                where.append("t1.tradefield like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append(")");
-            }
+        sys_enterpriseid = content.getLongValue("sys_enterpriseid");
 
-        }
-        SQLFactory sqlFactory = new SQLFactory(this, "企业领域授权_列表", pageSize, pageNumber, pageSorting);
-        if (content.containsKey("sys_enterpriseid")) {
-            sys_enterpriseid = content.getLongValue("sys_enterpriseid");
-        }
-        if (sys_enterpriseid == 0) {
-            sqlFactory = new SQLFactory(this, "全领域", pageSize, pageNumber, pageSorting);
 
-        }
+        QuerySQL querySQ = SQLFactory.createQuerySQL(this, "sys_enterprise_tradefield", "*")
+                .setTableAlias("t1");
+        querySQ.addJoinTable(JOINTYPE.left, "sys_hr", "t2", "t2.hrid=t1.hrid and t2.siteid=t1.siteid",
+                "name", "position", "hrcode", "phonenumber");
+        querySQ.addJoinTable(JOINTYPE.left, "sa_salearea", "t3", "t3.sa_saleareaid=t1.sa_saleareaid and t3.siteid=t1.siteid",
+                "areaname");
+        querySQ.addJoinTable(JOINTYPE.left, "sys_department", "t4", "t4.departmentid=t2.departmentid and t4.siteid=t2.siteid",
+                "depname");
+        querySQ.setSiteid(siteid);
+        querySQ.setWhere("sys_enterpriseid", sys_enterpriseid);
+        querySQ.setPage(pageSize, pageNumber);
+        Rows rows = querySQ.query();
 
-        sqlFactory.addParameter("siteid", siteid);
-        sqlFactory.addParameter_SQL("where", where);
-        sqlFactory.addParameter("sys_enterpriseid", sys_enterpriseid);
-        String sql = sqlFactory.getSQL();
-        Rows rows = dbConnect.runSqlQuery(sql);
 
-        RowsMap optionRowsMap = dbConnect.runSqlQuery("SELECT subvalues,VALUE FROM sys_optiontypemx WHERE optiontypeid IN (SELECT optiontypeid FROM sys_optiontype WHERE typename='tradefield') and siteid in ('','" + siteid + "')").toRowsMap("VALUE");
-        for (Row row : rows) {
-            row.put("subvalues", optionRowsMap.getOrDefault(row.getString("tradefield"), new Rows()));
-        }
         return getSucReturnObject().setData(rows).toString();
     }
 

src/custom/restcontroller/webmanage/sale/enterprisetradefield/SQL/企业领域授权_新增.sql

@@ -1,4 +1,4 @@
-insert into sys_enterprise_tradefield (sys_enterprise_tradefieldid, siteid, changeuserid, tradefield, sys_enterpriseid,
-                                       hrid, sa_saleareaid, tradefieldmx,sa_agentsid)
-values ($sys_enterprise_tradefieldid$, $siteid$, $userid$, $tradefield$, $sys_enterpriseid$, $hrid$, $sa_saleareaid$,
-        $tradefieldmx$,$sa_agentsid$);
+insert into sys_enterprise_tradefield (sys_enterprise_tradefieldid, siteid, changeuserid,  sys_enterpriseid,
+                                       hrid, sa_saleareaid,sa_agentsid)
+values ($sys_enterprise_tradefieldid$, $siteid$, $userid$,  $sys_enterpriseid$, $hrid$, $sa_saleareaid$,
+       $sa_agentsid$);

src/custom/restcontroller/webmanage/sale/enterprisetradefield/SQL/企业领域授权_更新.sql

@@ -1,10 +1,9 @@
 update sys_enterprise_tradefield
 set changeuserid=$userid$,
-    tradefield=$tradefield$,
     sys_enterpriseid=$sys_enterpriseid$,
     hrid=$hrid$,
-    sa_saleareaid=$sa_saleareaid$,
-    tradefieldmx=$tradefieldmx$
+    sa_saleareaid=$sa_saleareaid$
+
 where siteid = $siteid$
   and sys_enterprise_tradefieldid = $sys_enterprise_tradefieldid$
 

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

@@ -108,7 +108,6 @@ public class salearea2 extends Controller {
             querySQL.setPage(pageSize, pageNumber);
         }
         querySQL.setOrderBy("t1.createdate desc");
-        System.err.println(querySQL.getSQL());
         Rows rows = querySQL.query();
 
         RowsMap areaRowsMap = getAreaRowsMap(rows.toArrayList("sa_agentsid", new ArrayList<>()));