Commit 7f4c76e8 authored by Phạm Duy Phi's avatar Phạm Duy Phi

phipd commit

parent 266fb8e6
...@@ -86,28 +86,9 @@ public class AgentsServiceImpl implements AgentsService { ...@@ -86,28 +86,9 @@ public class AgentsServiceImpl implements AgentsService {
sb.append(" a.USER_NAME userName,"); sb.append(" a.USER_NAME userName,");
sb.append(" a.STATUS status,"); sb.append(" a.STATUS status,");
sb.append(" a.FULL_NAME fullName,"); sb.append(" a.FULL_NAME fullName,");
sb.append(" a.USER_TYPE_ID userTypeId,");
sb.append(" a.CREATE_DATE createDate,");
sb.append(" a.DESCRIPTION description,");
sb.append(" a.STAFF_CODE staffCode,");
sb.append(" a.MANAGER_ID managerId,");
sb.append(" a.LOCATION_ID locationId,");
sb.append(" a.DEPT_ID deptId,");
sb.append(" a.DEPT_LEVEL deptLevel,");
sb.append(" a.POS_ID posId,");
sb.append(" a.DEPT_NAME deptName,");
sb.append(" a.GROUP_ID groupId,");
sb.append(" a.SITE_ID siteId,");
sb.append(" a.COMPANY_SITE_ID companySiteId,"); sb.append(" a.COMPANY_SITE_ID companySiteId,");
sb.append(" a.AGENT_TYPE agentType,"); sb.append(" b.FILTER_TYPE filterType,");
sb.append(" a.MOBILE_NUMBER mobileNumber,"); sb.append(" b.CAMPAIGN_AGENT_ID campaignAgentId");
sb.append(" a.FACEBOOK_ID facebookId,");
sb.append(" a.LOGIN_TYPE loginType,");
sb.append(" a.GOOGLE_ID googleId,");
sb.append(" a.EMAIL email,");
sb.append(" a.AVAILABLE_TICKET availableTicket,");
sb.append(" a.USER_KAZOO_ID userKazooId,");
sb.append(" b.FILTER_TYPE filterType");
sb.append(" FROM VSA_USERS a"); sb.append(" FROM VSA_USERS a");
sb.append(" LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID"); sb.append(" LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
...@@ -124,28 +105,9 @@ public class AgentsServiceImpl implements AgentsService { ...@@ -124,28 +105,9 @@ public class AgentsServiceImpl implements AgentsService {
query.addScalar("userName", new StringType()); query.addScalar("userName", new StringType());
query.addScalar("status", new ShortType()); query.addScalar("status", new ShortType());
query.addScalar("fullName", new StringType()); query.addScalar("fullName", new StringType());
query.addScalar("userTypeId", new LongType());
query.addScalar("createDate", new DateType());
query.addScalar("description", new StringType());
query.addScalar("staffCode", new StringType());
query.addScalar("managerId", new LongType());
query.addScalar("locationId", new LongType());
query.addScalar("deptId", new LongType());
query.addScalar("deptLevel", new StringType());
query.addScalar("posId", new LongType());
query.addScalar("deptName", new StringType());
query.addScalar("groupId", new LongType());
query.addScalar("siteId", new LongType());
query.addScalar("companySiteId", new LongType()); query.addScalar("companySiteId", new LongType());
query.addScalar("agentType", new ShortType());
query.addScalar("mobileNumber", new StringType());
query.addScalar("facebookId", new StringType());
query.addScalar("loginType", new ShortType());
query.addScalar("googleId", new StringType());
query.addScalar("email", new StringType());
query.addScalar("availableTicket", new LongType());
query.addScalar("userKazooId", new StringType());
query.addScalar("filterType", new ShortType()); query.addScalar("filterType", new ShortType());
query.addScalar("campaignAgentId", new LongType());
query.setResultTransformer(Transformers.aliasToBean(VSAUsersDTO.class)); query.setResultTransformer(Transformers.aliasToBean(VSAUsersDTO.class));
int count = 0; int count = 0;
...@@ -199,28 +161,9 @@ public class AgentsServiceImpl implements AgentsService { ...@@ -199,28 +161,9 @@ public class AgentsServiceImpl implements AgentsService {
sb.append(" a.USER_NAME userName,"); sb.append(" a.USER_NAME userName,");
sb.append(" a.STATUS status,"); sb.append(" a.STATUS status,");
sb.append(" a.FULL_NAME fullName,"); sb.append(" a.FULL_NAME fullName,");
sb.append(" a.USER_TYPE_ID userTypeId,");
sb.append(" a.CREATE_DATE createDate,");
sb.append(" a.DESCRIPTION description,");
sb.append(" a.STAFF_CODE staffCode,");
sb.append(" a.MANAGER_ID managerId,");
sb.append(" a.LOCATION_ID locationId,");
sb.append(" a.DEPT_ID deptId,");
sb.append(" a.DEPT_LEVEL deptLevel,");
sb.append(" a.POS_ID posId,");
sb.append(" a.DEPT_NAME deptName,");
sb.append(" a.GROUP_ID groupId,");
sb.append(" a.SITE_ID siteId,");
sb.append(" a.COMPANY_SITE_ID companySiteId,"); sb.append(" a.COMPANY_SITE_ID companySiteId,");
sb.append(" a.AGENT_TYPE agentType,"); sb.append(" b.FILTER_TYPE filterType,");
sb.append(" a.MOBILE_NUMBER mobileNumber,"); sb.append(" b.CAMPAIGN_AGENT_ID campaignAgentId");
sb.append(" a.FACEBOOK_ID facebookId,");
sb.append(" a.LOGIN_TYPE loginType,");
sb.append(" a.GOOGLE_ID googleId,");
sb.append(" a.EMAIL email,");
sb.append(" a.AVAILABLE_TICKET availableTicket,");
sb.append(" a.USER_KAZOO_ID userKazooId,");
sb.append(" b.FILTER_TYPE filterType");
sb.append(" FROM VSA_USERS a"); sb.append(" FROM VSA_USERS a");
sb.append(" RIGHT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID"); sb.append(" RIGHT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
...@@ -238,28 +181,9 @@ public class AgentsServiceImpl implements AgentsService { ...@@ -238,28 +181,9 @@ public class AgentsServiceImpl implements AgentsService {
query.addScalar("userName", new StringType()); query.addScalar("userName", new StringType());
query.addScalar("status", new ShortType()); query.addScalar("status", new ShortType());
query.addScalar("fullName", new StringType()); query.addScalar("fullName", new StringType());
query.addScalar("userTypeId", new LongType());
query.addScalar("createDate", new DateType());
query.addScalar("description", new StringType());
query.addScalar("staffCode", new StringType());
query.addScalar("managerId", new LongType());
query.addScalar("locationId", new LongType());
query.addScalar("deptId", new LongType());
query.addScalar("deptLevel", new StringType());
query.addScalar("posId", new LongType());
query.addScalar("deptName", new StringType());
query.addScalar("groupId", new LongType());
query.addScalar("siteId", new LongType());
query.addScalar("companySiteId", new LongType()); query.addScalar("companySiteId", new LongType());
query.addScalar("agentType", new ShortType());
query.addScalar("mobileNumber", new StringType());
query.addScalar("facebookId", new StringType());
query.addScalar("loginType", new ShortType());
query.addScalar("googleId", new StringType());
query.addScalar("email", new StringType());
query.addScalar("availableTicket", new LongType());
query.addScalar("userKazooId", new StringType());
query.addScalar("filterType", new ShortType()); query.addScalar("filterType", new ShortType());
query.addScalar("campaignAgentId", new LongType());
query.setResultTransformer(Transformers.aliasToBean(VSAUsersDTO.class)); query.setResultTransformer(Transformers.aliasToBean(VSAUsersDTO.class));
int count = 0; int count = 0;
...@@ -409,27 +333,7 @@ public class AgentsServiceImpl implements AgentsService { ...@@ -409,27 +333,7 @@ public class AgentsServiceImpl implements AgentsService {
query.addScalar("userName", new StringType()); query.addScalar("userName", new StringType());
query.addScalar("status", new ShortType()); query.addScalar("status", new ShortType());
query.addScalar("fullName", new StringType()); query.addScalar("fullName", new StringType());
// query.addScalar("userTypeId", new LongType());
// query.addScalar("createDate", new DateType());
// query.addScalar("description", new StringType());
// query.addScalar("staffCode", new StringType());
// query.addScalar("managerId", new LongType());
// query.addScalar("locationId", new LongType());
// query.addScalar("deptId", new LongType());
// query.addScalar("deptLevel", new StringType());
// query.addScalar("posId", new LongType());
// query.addScalar("deptName", new StringType());
// query.addScalar("groupId", new LongType());
// query.addScalar("siteId", new LongType());
query.addScalar("companySiteId", new LongType()); query.addScalar("companySiteId", new LongType());
// query.addScalar("agentType", new ShortType());
// query.addScalar("mobileNumber", new StringType());
// query.addScalar("facebookId", new StringType());
// query.addScalar("loginType", new ShortType());
// query.addScalar("googleId", new StringType());
// query.addScalar("email", new StringType());
// query.addScalar("availableTicket", new LongType());
// query.addScalar("userKazooId", new StringType());
query.addScalar("filterType", new ShortType()); query.addScalar("filterType", new ShortType());
query.addScalar("campaignAgentId", new LongType()); query.addScalar("campaignAgentId", new LongType());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment