anhvd merge code lan cuoi nhe

.gitignore

@@ -3,3 +3,4 @@ target/
 logs/
 out/
 /campaign.iml
+/lib

src/main/java/com/viettel/campaign/repository/ccms_full/impl/UserActionLogRepositoryImpl.java

@@ -32,9 +32,30 @@ public class UserActionLogRepositoryImpl implements UserActionLogRepositoryCusto
         Session session = sessionFactory.openSession();
         session.beginTransaction();
         try{
-            StringBuilder sqlStr = new StringBuilder();
-            sqlStr.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "insert-to-user-action-log"));
-            SQLQuery query = session.createSQLQuery(sqlStr.toString());
+//            StringBuilder sqlStr = new StringBuilder();
+//            sqlStr.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "insert-to-user-action-log"));
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("INSERT INTO \"CCMS_FULL\".\"USER_ACTION_LOG\" (");
+            sb.append("    AGENT_ID,");
+            sb.append("    COMPANY_SITE_ID,");
+            sb.append("    SESSION_ID,");
+            sb.append("    START_TIME,");
+            sb.append("    END_TIME,");
+            sb.append("    ACTION_TYPE,");
+            sb.append("    DESCRIPTION,");
+            sb.append("    OBJECT_ID)");
+            sb.append(" VALUES (");
+            sb.append("    :par_agentId,");
+            sb.append("    :par_companySiteId,");
+            sb.append("    :par_sessionId,");
+            sb.append("    :par_startTime,");
+            sb.append("    null,");
+            sb.append("    :par_actionType,");
+            sb.append("    null,");
+            sb.append("    :par_objectId)");
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
             query.setParameter("par_agentId", userActionLogDTO.getAgentId() == null ? "" : userActionLogDTO.getAgentId());
             query.setParameter("par_companySiteId", userActionLogDTO.getCompanySiteId());
             query.setParameter("par_sessionId", userActionLogDTO.getSessionId());

src/main/java/com/viettel/campaign/service/impl/CampaignCfgServiceImpl.java

@@ -54,10 +54,36 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         }
 
         try {
-            StringBuilder sqlStrBuilder = new StringBuilder();
-            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG, "findAll-CampaignCompleteCode"));
-
-            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+//            StringBuilder sqlStrBuilder = new StringBuilder();
+//            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG, "findAll-CampaignCompleteCode"));
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("SELECT");
+            sb.append("    CAMPAIGN_COMPLETE_CODE_ID campaignCompleteCodeId,");
+            sb.append("    IS_RECALL isRecall ,");
+            sb.append("    CAMPAIGN_ID campaignId,");
+            sb.append("    COMPLETE_VALUE completeValue,");
+            sb.append("    COMPLETE_NAME completeName,");
+            sb.append("    COMPLETE_TYPE completeType,");
+            sb.append("    CAMPAIGN_TYPE campaignType,");
+            sb.append("    DESCRIPTION description,");
+            sb.append("    STATUS  status,");
+            sb.append("    COMPANY_SITE_ID companySiteId,");
+            sb.append("    UPDATE_BY updateBy ,");
+            sb.append("    UPDATE_AT updateAt,");
+            sb.append("    CREATE_BY createBy,");
+            sb.append("    CREATE_AT createAt,");
+            sb.append("    IS_FINISH isFinish,");
+            sb.append("    IS_LOCK isLock,");
+            sb.append("    DURATION_LOCK durationLock,");
+            sb.append("    CHANEL chanel");
+            sb.append(" FROM CAMPAIGN_COMPLETE_CODE");
+            sb.append(" where 1 = 1");
+            sb.append("  AND STATUS = 1");
+            sb.append("  and COMPANY_SITE_ID = :p_company_site_id");
+
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
 
             query.setParameter("p_company_site_id", companySiteId);
 
@@ -258,10 +284,16 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         }
 
         try {
-            StringBuilder sqlStrBuilder = new StringBuilder();
-            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG, "get-max-value-completevalue"));
+//            StringBuilder sqlStrBuilder = new StringBuilder();
+//            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG, "get-max-value-completevalue"));
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("SELECT max(to_number(COMPLETE_VALUE)) completeValue, COMPANY_SITE_ID ");
+            sb.append(" companySiteId from CAMPAIGN_COMPLETE_CODE where COMPANY_SITE_ID = :p_site_id ");
+            sb.append(" GROUP BY COMPANY_SITE_ID");
 
-            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
             query.setParameter("p_site_id", completeCodeDTO.getCompanySiteId());
 
             query.addScalar("completeValue", new StringType());
@@ -341,10 +373,35 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         }
 
         try {
-            StringBuilder sqlStrBuilder = new StringBuilder();
-            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG,"findCampaignCodeById"));
-
-            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+//            StringBuilder sqlStrBuilder = new StringBuilder();
+//            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG,"findCampaignCodeById"));
+
+
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("SELECT  CAMPAIGN_COMPLETE_CODE_ID campaignCompleteCodeId,");
+            sb.append("        IS_RECALL isRecall ,");
+            sb.append("        CAMPAIGN_ID campaignId,");
+            sb.append("        COMPLETE_VALUE completeValue,");
+            sb.append("        COMPLETE_NAME completeName,");
+            sb.append("        COMPLETE_TYPE completeType,");
+            sb.append("        CAMPAIGN_TYPE campaignType,");
+            sb.append("        DESCRIPTION description,");
+            sb.append("        STATUS  status,");
+            sb.append("        COMPANY_SITE_ID companySiteId,");
+            sb.append("        UPDATE_BY updateBy ,");
+            sb.append("        UPDATE_AT updateAt,");
+            sb.append("        CREATE_BY createBy,");
+            sb.append("        CREATE_AT createAt,");
+            sb.append("        IS_FINISH isFinish,");
+            sb.append("        IS_LOCK isLock,");
+            sb.append("        DURATION_LOCK durationLock,");
+            sb.append("        CHANEL chanel");
+            sb.append("        from CAMPAIGN_COMPLETE_CODE WHERE ");
+            sb.append(" CAMPAIGN_COMPLETE_CODE_ID=:p_campaignComleteCode");
+
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
 
             query.setParameter("p_campaignComleteCode",campaignCompleteCodeId);
 

src/main/java/com/viettel/campaign/utils/SQLBuilder.java

@@ -18,23 +18,23 @@ public class SQLBuilder {
     public static final String SQL_MODULE_CAMPAIGN_STATUS_MNG = "campaign-status-mng";
     public static final String SQL_MODULE_CAMPAIGN_CUSTOMER_MNG = "campaign-customer-mng";
 
-    public static String getSqlQueryById(String module,
-                                         String queryId) {
-        File folder = null;
-        try {
-            folder = new ClassPathResource(
-                    "sql" + File.separator + module + File.separator + queryId + ".sql").getFile();
-
-            // Read file
-            if (folder.isFile()) {
-                String sql = new String(Files.readAllBytes(Paths.get(folder.getAbsolutePath())));
-                return sql;
-            }
-        } catch (IOException e) {
-            return null;
-        }
-        return null;
-    }
+//    public static String getSqlQueryById(String module,
+//                                         String queryId) {
+//        File folder = null;
+//        try {
+//            folder = new ClassPathResource(
+//                    "sql" + File.separator + module + File.separator + queryId + ".sql").getFile();
+//
+//            // Read file
+//            if (folder.isFile()) {
+//                String sql = new String(Files.readAllBytes(Paths.get(folder.getAbsolutePath())));
+//                return sql;
+//            }
+//        } catch (IOException e) {
+//            return null;
+//        }
+//        return null;
+//    }
 
     public static Pageable buildPageable(BaseDTO obj) {
         Pageable pageable = null;

src/main/resources/sql/campaign-mng/campaign-agents-by-params.sql

@@ -3,30 +3,7 @@ SELECT
     a.USER_NAME userName,
     a.STATUS status,
     a.FULL_NAME fullName,
---     a.USER_TYPE_ID userTypeId,
---     a.CREATE_DATE createDate,
---     a.DESCRIPTION description,
---     a.STAFF_CODE staffCode,
---     a.MANAGER_ID managerId,
---     a.LOCATION_ID locationId,
---     a.DEPT_ID deptId,
---     a.DEPT_LEVEL deptLevel,
---     a.POS_ID posId,
---     a.DEPT_NAME deptName,
---     a.GROUP_ID groupId,
---     a.SITE_ID siteId,
     a.COMPANY_SITE_ID companySiteId,
---     a.AGENT_TYPE agentType,
---     a.MOBILE_NUMBER mobileNumber,
---     a.FACEBOOK_ID facebookId,
---     a.LOGIN_TYPE loginType,
---     a.GOOGLE_ID googleId,
---     a.EMAIL email,
---     a.AVAILABLE_TICKET availableTicket,
---     a.USER_KAZOO_ID userKazooId,
     b.FILTER_TYPE filterType,
     b.CAMPAIGN_AGENT_ID campaignAgentId
 FROM VSA_USERS a
---          LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID
--- WHERE 1 = 1
---   AND a.COMPANY_SITE_ID = :p_company_site_id

src/main/resources/sql/campaign-mng/campaign-customer-detail-by-params.sql

@@ -14,12 +14,12 @@ select
     b.IPCC_STATUS ipccStatus,
     c.MOBILE mobileNumber,
     d.EMAIL email
-from CUSTOMER_LIST_MAPPING a
+ from CUSTOMER_LIST_MAPPING a
          join CUSTOMER b on a.CUSTOMER_ID = b.CUSTOMER_ID
          left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS MOBILE
                FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 5 GROUP BY CUSTOMER_ID) c on b.CUSTOMER_ID = c.CUSTOMER_ID
          left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS EMAIL
                FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 2 GROUP BY CUSTOMER_ID) d on b.CUSTOMER_ID = d.CUSTOMER_ID
-where 1 = 1
+ where 1 = 1
    and a.COMPANY_SITE_ID = :p_company_site_id
    and a.CUSTOMER_LIST_ID = :p_customer_list_id

src/main/resources/sql/campaign-status-mng/findAll-CampaignCompleteCode.sql

@@ -19,8 +19,8 @@ SELECT
     CHANEL chanel
 
 
-FROM CAMPAIGN_COMPLETE_CODE
-where 1 = 1
+ FROM CAMPAIGN_COMPLETE_CODE
+ where 1 = 1
   AND STATUS = 1
   and COMPANY_SITE_ID = :p_company_site_id