anhvd commit merge code

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

@@ -54,10 +54,36 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         }
 
         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,8 +284,11 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         }
 
         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"));
+
+            sqlStrBuilder.append("SELECT max(to_number(COMPLETE_VALUE)) completeValue, COMPANY_SITE_ID companySiteId from CAMPAIGN_COMPLETE_CODE where COMPANY_SITE_ID = :p_site_id GROUP BY COMPANY_SITE_ID");
 
             SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
             query.setParameter("p_site_id", completeCodeDTO.getCompanySiteId());
@@ -341,10 +370,31 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         }
 
         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 CAMPAIGN_COMPLETE_CODE_ID=:p_campaignComleteCode");
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
 
             query.setParameter("p_campaignComleteCode",campaignCompleteCodeId);
 

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

@@ -286,27 +286,136 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         //TimeRangeDialMode rangeDialMode = rangeDialModeRepository.findDialModeAtCurrent(Long.parseLong(dto.getCampaignId()), Long.parseLong(dto.getCompanySiteId()));
         List<CampaignCustomerDTO> lst = new ArrayList<>();
         // Khách hàng đến thời điểm hẹn gọi lại và là khách hàng mà chính NSD hẹn gọi lại
-        List<CampaignCustomerDTO> lst1 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer1"));
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("SELECT CC.CUSTOMER_ID AS customerId");
+        sb.append(" FROM CAMPAIGN_CUSTOMER CC");
+        sb.append("    LEFT JOIN CCMS_FULL.RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID");
+        sb.append(" WHERE CC.CAMPAIGN_ID = :campaignId");
+        sb.append("  AND CC.COMPANY_SITE_ID = :companySiteId");
+        sb.append("  AND CC.IN_CAMPAIGN_STATUS = 1");
+        sb.append("  AND CL.CUSTOMER_ID IS NULL");
+        sb.append("  AND CL.END_TIME IS NULL");
+        sb.append("  AND EXISTS(SELECT 1");
+        sb.append("        FROM CCMS_FULL.CAMPAIGN_COMPLETE_CODE CCC");
+        sb.append("        WHERE CC.STATUS = CCC.COMPLETE_VALUE");
+        sb.append("          AND STATUS = 1");
+        sb.append("          AND IS_RECALL = 1");
+        sb.append("          AND COMPLETE_TYPE = 2");
+        sb.append("          AND COMPANY_SITE_ID = :companySiteId)");
+        sb.append("  AND CC.RECALL_TIME <= SYSDATE");
+        sb.append("  AND CC.RECALL_TIME + NUMTODSINTERVAL(:dungSai, 'MINUTE') >= SYSDATE");
+        sb.append("  AND CC.AGENT_ID = :agentId");
+
+
+        StringBuilder sb2 = new StringBuilder();
+
+        sb2.append("SELECT CC.CUSTOMER_ID AS customerId");
+        sb2.append(" FROM CCMS_FULL.CAMPAIGN_CUSTOMER CC");
+        sb2.append("    LEFT JOIN CCMS_FULL.RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID");
+        sb2.append("    LEFT JOIN ACD_FULL.AGENTS AG ON CC.AGENT_ID = AG.AGENT_ID AND CC.CAMPAIGN_ID = AG.CURRENT_CAMPAIGN_ID");
+        sb2.append(" WHERE CC.CAMPAIGN_ID = :campaignId");
+        sb2.append("  AND CC.COMPANY_SITE_ID = :companySiteId");
+        sb2.append("  AND CC.IN_CAMPAIGN_STATUS = 1");
+        sb2.append("  AND CL.CUSTOMER_ID IS NULL");
+        sb2.append("  AND CL.END_TIME IS NULL");
+        sb2.append("  AND EXISTS(SELECT 1");
+        sb2.append("        FROM CCMS_FULL.CAMPAIGN_COMPLETE_CODE CCC");
+        sb2.append("        WHERE CC.STATUS = CCC.COMPLETE_VALUE");
+        sb2.append("          AND STATUS = 1");
+        sb2.append("          AND IS_RECALL = 1");
+        sb2.append("          AND COMPLETE_TYPE = 2");
+        sb2.append("          AND COMPANY_SITE_ID = :companySiteId)");
+        sb2.append("  AND CC.RECALL_TIME <= SYSDATE");
+        sb2.append("  AND CC.RECALL_TIME + NUMTODSINTERVAL(:dungSai, 'MINUTE') >= SYSDATE");
+        sb2.append("  AND (AG.CAMPAIGN_SYSTEM_STATUS IS NULL OR AG.CAMPAIGN_SYSTEM_STATUS <> 'AVAILABLE')");
+
+        StringBuilder sb3 = new StringBuilder();
+
+        sb3.append("SELECT CC.CUSTOMER_ID AS customerId");
+        sb3.append(" FROM CAMPAIGN_CUSTOMER CC");
+        sb3.append("    LEFT JOIN RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID");
+        sb3.append(" WHERE CC.CAMPAIGN_ID = :campaignId");
+        sb3.append("  AND CC.COMPANY_SITE_ID = :companySiteId");
+        sb3.append("  AND CC.IN_CAMPAIGN_STATUS = 1");
+        sb3.append("  AND CL.CUSTOMER_ID IS NULL");
+        sb3.append("  AND CL.END_TIME IS NULL");
+        sb3.append("  AND EXISTS(SELECT 1");
+        sb3.append("        FROM CCMS_FULL.CAMPAIGN_COMPLETE_CODE CCC");
+        sb3.append("        WHERE CC.STATUS = CCC.COMPLETE_VALUE");
+        sb3.append("          AND STATUS = 1");
+        sb3.append("          AND IS_RECALL = 1");
+        sb3.append("          AND COMPLETE_TYPE = 2");
+        sb3.append("          AND COMPANY_SITE_ID = :companySiteId)");
+        sb3.append("  AND CC.RECALL_TIME + NUMTODSINTERVAL(:dungSai, 'MINUTE') <= SYSDATE");
+
+        StringBuilder sb4 = new StringBuilder();
+
+        sb4.append("SELECT CC.CUSTOMER_ID AS customerId ");
+        sb4.append(" FROM CAMPAIGN_CUSTOMER CC");
+        sb4.append("    INNER JOIN CUSTOMER C ON CC.CUSTOMER_ID = C.CUSTOMER_ID");
+        sb4.append("    LEFT JOIN RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID");
+        sb4.append(" WHERE CC.CAMPAIGN_ID = :campaignId");
+        sb4.append("  AND CC.COMPANY_SITE_ID = :companySiteId");
+        sb4.append("  AND CC.IN_CAMPAIGN_STATUS = 1");
+        sb4.append("  AND CL.CUSTOMER_ID IS NULL");
+        sb4.append("  AND CL.END_TIME IS NULL");
+        sb4.append("  AND CC.STATUS = 0");
+        sb4.append("  AND C.STATUS = 1");
+        sb4.append("  AND C.CALL_ALLOWED = 1");
+        sb4.append("  AND C.IPCC_STATUS = 'active'");
+
+        StringBuilder sb5 = new StringBuilder();
+
+        sb5.append("SELECT CC.CUSTOMER_ID AS customerId");
+        sb5.append(" FROM CAMPAIGN_CUSTOMER CC");
+        sb5.append("    LEFT JOIN CCMS_FULL.RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID");
+        sb5.append(" WHERE CC.CAMPAIGN_ID = :campaignId");
+        sb5.append("  AND CC.COMPANY_SITE_ID = :companySiteId");
+        sb5.append("  AND CC.IN_CAMPAIGN_STATUS = 1");
+        sb5.append("  AND CL.CUSTOMER_ID IS NULL");
+        sb5.append("  AND CL.END_TIME IS NULL");
+        sb5.append("  AND EXISTS(SELECT 1");
+        sb5.append("        FROM CCMS_FULL.CAMPAIGN_COMPLETE_CODE CCC");
+        sb5.append("        WHERE CC.STATUS = CCC.COMPLETE_VALUE");
+        sb5.append("          AND STATUS = 1");
+        sb5.append("          AND IS_FINISH = 0");
+        sb5.append("          AND COMPLETE_TYPE = 1");
+        sb5.append("          AND COMPANY_SITE_ID = :companySiteId)");
+        sb5.append("  AND CC.RECALL_COUNT < C.MAX_RECALL");
+        sb5.append("  AND C.STATUS = 1");
+        sb5.append("  AND C.CALL_ALLOWED = 1");
+        sb5.append("  AND C.IPCC_STATUS = 'active'");
+
+
+
+        String getExecuteCus1Str = sb.toString();
+        String getExecuteCus2Str = sb2.toString();
+        String getExecuteCus3Str = sb3.toString();
+        String getExecuteCus4Str = sb4.toString();
+        String getExecuteCus5Str = sb5.toString();
+
+        List<CampaignCustomerDTO> lst1 = campaignCustomerRepository.getDataCampaignCustomer(dto, getExecuteCus1Str);
         if (lst1.size() > 0) {
             lst = lst1;
         } else {
             // Khách hàng đến thời điểm hẹn gọi lại và không là khách hàng mà NSD dùng hẹn gọi lại nhưng TVV hẹn gọi lại không đăng nhập hoặc không thực hiện chiến dịch hiện tại
-            List<CampaignCustomerDTO> lst2 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer2"));
+            List<CampaignCustomerDTO> lst2 = campaignCustomerRepository.getDataCampaignCustomer(dto, getExecuteCus2Str);
             if (lst2.size() > 0) {
                 lst = lst2;
             } else {
                 // Khách hàng là khách hàng hẹn gọi lại nhưng thời gian hẹn gọi lại đã quá thời gian hẹn gọi lại + dung sai
-                List<CampaignCustomerDTO> lst3 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer3"));
+                List<CampaignCustomerDTO> lst3 = campaignCustomerRepository.getDataCampaignCustomer(dto, getExecuteCus3Str);
                 if (lst3.size() > 0) {
                     lst = lst3;
                 } else {
                     // Khách hàng mới
-                    List<CampaignCustomerDTO> lst4 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer4"));
+                    List<CampaignCustomerDTO> lst4 = campaignCustomerRepository.getDataCampaignCustomer(dto, getExecuteCus4Str);
                     if (lst4.size() > 0) {
                         lst = lst4;
                     } else {
                         // Khách hàng không liên lạc được nhưng chưa phải là cuộc gọi kết thúc và có số lần đã gọi < Số lần gọi tối đa được cấu hình và khoảng cách giữa 2 lần gọi < thời gian tương tác giữa 2 lần gọi được cấu hình
-                        List<CampaignCustomerDTO> lst5 = campaignCustomerRepository.getDataCampaignCustomer(dto, SQLBuilder.getSqlQueryById("campaign-execute", "get-execute-customer5"));
+                        List<CampaignCustomerDTO> lst5 = campaignCustomerRepository.getDataCampaignCustomer(dto, getExecuteCus5Str);
                         lst = lst5;
                     }
                 }

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-execute/get-execute-customer5.sql

 SELECT CC.CUSTOMER_ID AS customerId
-FROM CAMPAIGN_CUSTOMER CC
+ FROM CAMPAIGN_CUSTOMER CC
     LEFT JOIN CCMS_FULL.RECEIVE_CUST_LOG CL ON CC.CUSTOMER_ID = CL.CUSTOMER_ID
-WHERE CC.CAMPAIGN_ID = :campaignId
+ WHERE CC.CAMPAIGN_ID = :campaignId
   AND CC.COMPANY_SITE_ID = :companySiteId
   AND CC.IN_CAMPAIGN_STATUS = 1
   AND CL.CUSTOMER_ID IS NULL