|
|
@@ -386,6 +386,11 @@ public class hospitaldep extends Controller {
|
|
|
where.append(" and t1.sa_agentsid not in (SELECT sa_agentsid from sa_agents_hospital " +
|
|
|
"WHERE sa_hospitaldepid="+sa_hospitaldepid+")");
|
|
|
|
|
|
+ String sql=" and t1.sa_agentsid in (SELECT sa_agentsid from sys_enterprise_tradefield " +
|
|
|
+ "WHERE hrid in "+hrids+")";
|
|
|
+ sql= sql.replace("[","(").replace("]",")");
|
|
|
+ where.append(sql);
|
|
|
+
|
|
|
|
|
|
QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents",
|
|
|
"sa_agentsid", "sys_enterpriseid", "gmname", "gmphonenumber", "agentnum", "cooperatetype", "remarks", "status", "createdate", "scale", "mainproducts").
|
|
|
@@ -394,8 +399,8 @@ public class hospitaldep extends Controller {
|
|
|
"enterprisename", "province", "city", "county", "address");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_dataextend", "t3", "t1.sys_enterpriseid = t3.ownerid and ownertable = 'sys_enterprise' and t1.siteid = t3.siteid",
|
|
|
"erpagentnum");
|
|
|
- querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise_tradefield", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid");
|
|
|
- querySQL.setWhere("t4.hrid", hrids);
|
|
|
+// querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise_tradefield", "t4", "t4.sa_agentsid=t1.sa_agentsid and t4.siteid=t1.siteid");
|
|
|
+// querySQL.setWhere("t4.hrid", hrids);
|
|
|
|
|
|
querySQL.setSiteid(siteid);
|
|
|
querySQL.setWhere(where);
|
|
|
@@ -502,8 +507,9 @@ public class hospitaldep extends Controller {
|
|
|
"erpagentnum");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.siteid = t1.siteid and t4.sa_agentsid = t1.parentid");
|
|
|
querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.siteid = t4.siteid and t5.sys_enterpriseid = t4.sys_enterpriseid");
|
|
|
+ querySQL.addJoinTable(JOINTYPE.inner, "sa_agents_hospital", "t6", "t6.siteid = t1.siteid and t6.sa_agentsid = t1.sa_agentsid");
|
|
|
querySQL.addQueryFields("parent_enterprisename", "t5.enterprisename");
|
|
|
- querySQL.setWhere("t1.sa_agentsid in (SELECT sa_agentsid from sa_agents_hospital WHERE sa_hospitaldepid=" + sa_hospitaldepid + " and siteid='" + siteid + "')");
|
|
|
+ querySQL.setWhere("t6.sa_hospitaldepid",sa_hospitaldepid);
|
|
|
querySQL.setSiteid(siteid);
|
|
|
querySQL.setWhere(where);
|
|
|
querySQL.setPage(pageSize, pageNumber);
|