Merge branch 'master' of https://git.myitsol.com/hanv/service-campaign

src/main/java/com/viettel/campaign/filter/CorsFilter.java

@@ -31,27 +31,27 @@ public class CorsFilter implements Filter {
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-//        chain.doFilter(req, resp);
-
-        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
-            chain.doFilter(req, resp);
-            return;
-        }
-        if ("/".equals(request.getRequestURI())) {
-            chain.doFilter(req, resp);
-            return;
-        }
-        String xAuthToken = request.getHeader("X-Auth-Token");
-        if (xAuthToken == null || "".equals(xAuthToken)) {
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
-            return;
-        }
-        Object obj = RedisUtil.getInstance().get(xAuthToken);
-        if (obj instanceof UserSession) {
         chain.doFilter(req, resp);
-        } else {
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
-        }
+
+//        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
+//            chain.doFilter(req, resp);
+//            return;
+//        }
+//        if ("/".equals(request.getRequestURI())) {
+//            chain.doFilter(req, resp);
+//            return;
+//        }
+//        String xAuthToken = request.getHeader("X-Auth-Token");
+//        if (xAuthToken == null || "".equals(xAuthToken)) {
+//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
+//            return;
+//        }
+//        Object obj = RedisUtil.getInstance().get(xAuthToken);
+//        if (obj instanceof UserSession) {
+//            chain.doFilter(req, resp);
+//        } else {
+//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
+//        }
     }
 
     @Override

src/main/java/com/viettel/campaign/repository/ccms_full/ScenarioAnswerRepository.java

@@ -20,4 +20,8 @@ public interface ScenarioAnswerRepository extends JpaRepository<ScenarioAnswer,
 
     @Query(value="SELECT MAX(orderIndex) FROM ScenarioAnswer WHERE scenarioQuestionId = :scenarioQuestionId AND companySiteId = :companySiteId AND status = 1")
     Long getMaxAnswerOrderId(@Param("scenarioQuestionId") Long scenarioQuestionId, @Param("companySiteId") Long companySiteId);
+
+    Integer deleteScenarioAnswersByScenarioQuestionId(Long scenarioQuestionId);
+
+    ScenarioAnswer findScenarioAnswerByScenarioAnswerId(Long scenarioAnswerId);
 }

src/main/java/com/viettel/campaign/repository/ccms_full/ScenarioQuestionRepository.java

@@ -21,4 +21,6 @@ public interface ScenarioQuestionRepository extends JpaRepository<ScenarioQuesti
 
     @Query(value = "SELECT COUNT(1) FROM ScenarioQuestion WHERE code = :code AND scenarioId = :scenarioId AND campaignId = :campaignId AND companySiteId = :companySiteId AND status = 1")
     Integer countDuplicateQuestionCode(@Param("code") String code, @Param("scenarioId") Long scenarioId, @Param("campaignId") Long campaignId, @Param("companySiteId") Long companySiteId);
+
+    ScenarioQuestion findScenarioQuestionByScenarioQuestionId(Long scenarioQuestionId);
 }

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/ScenarioAnswerService.java

 package com.viettel.campaign.service;
 
 import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.ScenarioAnswerDTO;
 
 /**
  * @author anhvd_itsol
@@ -10,4 +11,6 @@ public interface ScenarioAnswerService {
     ResultDTO findByScenarioQuestionCompany(Long scenarioQuestionId, Long companySiteId);
 
     Long getMaxAnswerOrderId(Long scenarioQuestionId, Long companySiteId);
+
+    ResultDTO delete(ScenarioAnswerDTO scenarioAnswerDTO);
 }

src/main/java/com/viettel/campaign/service/ScenarioQuestionService.java

@@ -15,4 +15,6 @@ public interface ScenarioQuestionService {
     Long getMaxOrderId(Long scenarioId, Long campaignId, Long companySiteId);
 
     Integer countDuplicateQuestionCode(String code, Long scenarioId, Long campaignId, Long companySiteId);
+
+    ResultDTO delete(ScenarioQuestionDTO scenarioQuestionDTO);
 }

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

@@ -74,16 +74,47 @@ public class AgentsServiceImpl implements AgentsService {
         }
 
         try {
-            StringBuilder sqlStrBuilder = new StringBuilder();
-            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
-
-            sqlStrBuilder.append(" LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
-            sqlStrBuilder.append(" WHERE 1 = 1");
-            sqlStrBuilder.append(" AND a.COMPANY_SITE_ID = :p_company_site_id");
-            sqlStrBuilder.append(" AND b.AGENT_ID IS NULL");
-            sqlStrBuilder.append(" ORDER BY a.FULL_NAME ASC");
-
-            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+//            StringBuilder  sb = new StringBuilder();
+//             sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
+
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("SELECT");
+            sb.append("    a.USER_ID userId,");
+            sb.append("    a.USER_NAME userName,");
+            sb.append("    a.STATUS status,");
+            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.AGENT_TYPE agentType,");
+            sb.append("    a.MOBILE_NUMBER mobileNumber,");
+            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(" LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
+            sb.append(" WHERE 1 = 1");
+            sb.append(" AND a.COMPANY_SITE_ID = :p_company_site_id");
+            sb.append(" AND b.AGENT_ID IS NULL");
+            sb.append(" ORDER BY a.FULL_NAME ASC");
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
 
             query.setParameter("p_company_site_id", companySiteId);
 
@@ -157,16 +188,46 @@ public class AgentsServiceImpl implements AgentsService {
         }
 
         try {
-            StringBuilder sqlStrBuilder = new StringBuilder();
-            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
-
-            sqlStrBuilder.append(" RIGHT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
-            sqlStrBuilder.append(" WHERE 1 = 1");
-            sqlStrBuilder.append(" AND b.COMPANY_SITE_ID = :p_company_site_id");
-            sqlStrBuilder.append(" AND b.CAMPAIGN_ID = :p_campaign_id");
-            sqlStrBuilder.append(" ORDER BY a.FULL_NAME ASC");
-
-            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+//            StringBuilder sb = new StringBuilder();
+//            sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
+            StringBuilder sb = new StringBuilder();
+
+            sb.append("SELECT");
+            sb.append("    a.USER_ID userId,");
+            sb.append("    a.USER_NAME userName,");
+            sb.append("    a.STATUS status,");
+            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.AGENT_TYPE agentType,");
+            sb.append("    a.MOBILE_NUMBER mobileNumber,");
+            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(" RIGHT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
+            sb.append(" WHERE 1 = 1");
+            sb.append(" AND b.COMPANY_SITE_ID = :p_company_site_id");
+            sb.append(" AND b.CAMPAIGN_ID = :p_campaign_id");
+            sb.append(" ORDER BY a.FULL_NAME ASC");
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
 
             query.setParameter("p_company_site_id", companySiteId);
             query.setParameter("p_campaign_id", campaignId);

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

@@ -294,27 +294,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/service/impl/ScenarioAnswerServiceImpl.java

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.config.DataSourceQualify;
+import com.viettel.campaign.model.ccms_full.Campaign;
+import com.viettel.campaign.model.ccms_full.CampaignLog;
 import com.viettel.campaign.model.ccms_full.ScenarioAnswer;
+import com.viettel.campaign.repository.ccms_full.CampaignLogRepository;
+import com.viettel.campaign.repository.ccms_full.CampaignRepository;
 import com.viettel.campaign.repository.ccms_full.ScenarioAnswerRepository;
 import com.viettel.campaign.service.ScenarioAnswerService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.ScenarioAnswerDTO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,13 +25,21 @@ import java.util.List;
  */
 
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class ScenarioAnswerServiceImpl implements ScenarioAnswerService {
     private static final Logger logger = LogManager.getLogger(ScenarioQuestionServiceImpl.class);
 
     @Autowired
     ScenarioAnswerRepository scenarioAnswerRepository;
 
+    @Autowired
+    CampaignRepository campaignRepository;
+
+    @Autowired
+    CampaignLogRepository campaignLogRepository;
+
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO findByScenarioQuestionCompany(Long scenarioQuestionId, Long companySiteId) {
         ResultDTO resultDTO = new ResultDTO();
         try {
@@ -40,6 +56,7 @@ public class ScenarioAnswerServiceImpl implements ScenarioAnswerService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public Long getMaxAnswerOrderId(Long scenarioQuestionId, Long companySiteId) {
         try {
             return scenarioAnswerRepository.getMaxAnswerOrderId(scenarioQuestionId, companySiteId);
@@ -48,4 +65,52 @@ public class ScenarioAnswerServiceImpl implements ScenarioAnswerService {
         }
         return null;
     }
+
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO delete(ScenarioAnswerDTO scenarioAnswerDTO) {
+        ResultDTO resultDTO = new ResultDTO();
+        CampaignLog campaignLog;
+        try {
+            //find campaign
+            Campaign campaign = campaignRepository.findByCampaignId(scenarioAnswerDTO.getCampaignId());
+            if(campaign != null) {
+                if (campaign.getStatus() == 0L || campaign.getStatus() == 1L) {
+                    scenarioAnswerRepository.deleteById(scenarioAnswerDTO.scenarioAnswerId);
+                    campaignLog = new CampaignLog();
+                    campaignLog.setCompanySiteId(scenarioAnswerDTO.getCompanySiteId());
+                    campaignLog.setCreateTime(new Date());
+                    campaignLog.setAgentId(null);
+                    campaignLog.setTableName("SCENARIO_ANSWER");
+                    campaignLog.setDescription("Xoa cau tra loi");
+                    campaignLog.setCampaignId(scenarioAnswerDTO.getCampaignId());
+                    campaignLog.setCustomerId(scenarioAnswerDTO.getScenarioAnswerId());
+                    campaignLogRepository.save(campaignLog);
+                }
+                else {
+                    ScenarioAnswer answer = scenarioAnswerRepository.findScenarioAnswerByScenarioAnswerId(scenarioAnswerDTO.getScenarioAnswerId());
+                    answer.setStatus((short) 0);
+                    answer.setDeleteTime(new Date());
+                    scenarioAnswerRepository.save(answer);
+
+                    campaignLog = new CampaignLog();
+                    campaignLog.setCompanySiteId(scenarioAnswerDTO.getCompanySiteId());
+                    campaignLog.setCreateTime(new Date());
+                    campaignLog.setAgentId(null);
+                    campaignLog.setTableName("SCENARIO_ANSWER");
+                    campaignLog.setDescription("Chinh sua tra loi");
+                    campaignLog.setCampaignId(scenarioAnswerDTO.getCampaignId());
+                    campaignLog.setCustomerId(scenarioAnswerDTO.getScenarioAnswerId());
+                    campaignLogRepository.save(campaignLog);
+                }
+                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            }
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
 }

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

 package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.config.DataSourceQualify;
-import com.viettel.campaign.model.ccms_full.CampaignLog;
-import com.viettel.campaign.model.ccms_full.Scenario;
-import com.viettel.campaign.model.ccms_full.ScenarioAnswer;
-import com.viettel.campaign.model.ccms_full.ScenarioQuestion;
+import com.viettel.campaign.model.ccms_full.*;
 import com.viettel.campaign.repository.ccms_full.CampaignLogRepository;
+import com.viettel.campaign.repository.ccms_full.CampaignRepository;
 import com.viettel.campaign.repository.ccms_full.ScenarioAnswerRepository;
 import com.viettel.campaign.repository.ccms_full.ScenarioQuestionRepository;
 import com.viettel.campaign.service.ScenarioQuestionService;
@@ -42,6 +40,9 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
     @Autowired
     ScenarioAnswerRepository scenarioAnswerRepository;
 
+    @Autowired
+    CampaignRepository campaignRepository;
+
     @Autowired
     ModelMapper modelMapper;
 
@@ -50,7 +51,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
     public ResultDTO findByScenarioIdAndCampaignIdAndCompanySiteId(Long scenarioId, Long campaignId, Long companySiteId) {
         ResultDTO resultDTO = new ResultDTO();
         try {
-            List<ScenarioQuestion> lst = scenarioQuestionRepository.findScenarioQuestionsByScenarioIdAndCampaignIdAndCompanySiteIdAndStatusOrderByOrderIndex(scenarioId, campaignId, companySiteId, (short)1);
+            List<ScenarioQuestion> lst = scenarioQuestionRepository.findScenarioQuestionsByScenarioIdAndCampaignIdAndCompanySiteIdAndStatusOrderByOrderIndex(scenarioId, campaignId, companySiteId, (short) 1);
             resultDTO.setData(lst);
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -127,7 +128,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
     public Long getMaxOrderId(Long scenarioId, Long campaignId, Long companySiteId) {
         try {
             return scenarioQuestionRepository.getMaxOrderId(scenarioId, campaignId, companySiteId);
-        }catch (Exception ex) {
+        } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }
         return null;
@@ -138,10 +139,86 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
     public Integer countDuplicateQuestionCode(String code, Long scenarioId, Long campaignId, Long companySiteId) {
         try {
             return scenarioQuestionRepository.countDuplicateQuestionCode(code, scenarioId, campaignId, companySiteId);
-        }catch (Exception ex) {
+        } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }
         return null;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO delete(ScenarioQuestionDTO scenarioQuestionDTO) {
+        ResultDTO resultDTO = new ResultDTO();
+        CampaignLog campaignLog;
+        try {
+            //find campaign
+            Campaign campaign = campaignRepository.findByCampaignId(scenarioQuestionDTO.getCampaignId());
+            if (campaign != null) {
+                if (campaign.getStatus() == 0L || campaign.getStatus() == 1L) {
+                    //delete question by questionId
+                    scenarioQuestionRepository.deleteById(scenarioQuestionDTO.getScenarioQuestionId());
+                    campaignLog = new CampaignLog();
+                    campaignLog.setCompanySiteId(scenarioQuestionDTO.getCompanySiteId());
+                    campaignLog.setCreateTime(new Date());
+                    campaignLog.setTableName("SCENARIO_QUESTION");
+                    campaignLog.setDescription("Xoa cau hoi");
+                    campaignLog.setCampaignId(scenarioQuestionDTO.getCampaignId());
+                    campaignLog.setCustomerId(scenarioQuestionDTO.getScenarioQuestionId());
+                    campaignLogRepository.save(campaignLog);
+
+                    //delete answer by questionId
+                    scenarioAnswerRepository.deleteScenarioAnswersByScenarioQuestionId(scenarioQuestionDTO.getScenarioQuestionId());
+                    campaignLog = new CampaignLog();
+                    campaignLog.setCompanySiteId(scenarioQuestionDTO.getCompanySiteId());
+                    campaignLog.setCreateTime(new Date());
+                    campaignLog.setTableName("SCENARIO_ANSWER");
+                    campaignLog.setDescription("Xoa cau tra loi");
+                    campaignLog.setCampaignId(scenarioQuestionDTO.getCampaignId());
+                    campaignLog.setCustomerId(scenarioQuestionDTO.getScenarioQuestionId());
+                    campaignLogRepository.save(campaignLog);
+                } else {
+                    //get and update status question
+                    ScenarioQuestion scenarioQuestion = scenarioQuestionRepository.findScenarioQuestionByScenarioQuestionId(scenarioQuestionDTO.getScenarioQuestionId());
+                    scenarioQuestion.setStatus((short) 0);
+                    scenarioQuestion.setDeleteTime(new Date());
+                    scenarioQuestionRepository.save(scenarioQuestion);
+
+                    campaignLog = new CampaignLog();
+                    campaignLog.setCompanySiteId(scenarioQuestionDTO.getCompanySiteId());
+                    campaignLog.setCreateTime(new Date());
+                    campaignLog.setTableName("SCENARIO_QUESTION");
+                    campaignLog.setDescription("Chinh sua cau hoi");
+                    campaignLog.setCampaignId(scenarioQuestionDTO.getCampaignId());
+                    campaignLog.setCustomerId(scenarioQuestionDTO.getScenarioQuestionId());
+                    campaignLogRepository.save(campaignLog);
+
+                    List<ScenarioAnswer> lstAnswer = scenarioAnswerRepository.findByScenarioQuestionIdAndCompanySiteIdAndStatus(scenarioQuestion.getScenarioQuestionId(),
+                            scenarioQuestion.getCompanySiteId(), (short) 1);
+                    if(lstAnswer.size() > 0) {
+                        lstAnswer.forEach(answer -> {
+                            answer.setStatus((short) 0);
+                            answer.setDeleteTime(new Date());
+
+                            CampaignLog log = new CampaignLog();
+                            log.setCompanySiteId(scenarioQuestionDTO.getCompanySiteId());
+                            log.setCreateTime(new Date());
+                            log.setTableName("SCENARIO_ANSWER");
+                            log.setDescription("Chinh sua cau tra loi");
+                            log.setCampaignId(scenarioQuestionDTO.getCampaignId());
+                            log.setCustomerId(answer.getScenarioAnswerId());
+                            campaignLogRepository.save(log);
+                        });
+                    }
+                }
+                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            }
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
+
 }

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/java/com/viettel/campaign/web/dto/ScenarioAnswerDTO.java

@@ -24,4 +24,5 @@ public class ScenarioAnswerDTO implements Serializable {
     public Date createTime;
     public Date deleteTime;
     public Long mappingQuestionId;
+    public Long campaignId;
 }

src/main/java/com/viettel/campaign/web/rest/CampaignController.java

@@ -27,7 +27,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/ipcc/campaign")
-@CrossOrigin
+@CrossOrigin("*")
 public class CampaignController {
 
     private static final Logger logger = LoggerFactory.getLogger(CampaignController.class);
@@ -170,7 +170,7 @@ public class CampaignController {
         return new ResponseEntity<byte[]>(contentReturn, headers, HttpStatus.OK);
     }
 
-    @RequestMapping(value = "/changeCampaignStatus", method = RequestMethod.PUT)
+    @RequestMapping(value = "/changeCampaignStatus", method = RequestMethod.POST)
     public ResultDTO changeCampaignStatus(@RequestBody CampaignDTO dto, HttpServletRequest request) {
         dto.setSessionId(request.getSession().getId());
         return campaignService.changeCampaignStatus(dto);

src/main/java/com/viettel/campaign/web/rest/ScenarioAnswerController.java

@@ -2,6 +2,7 @@ package com.viettel.campaign.web.rest;
 
 import com.viettel.campaign.service.ScenarioAnswerService;
 import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.ScenarioAnswerDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -30,4 +31,10 @@ public class ScenarioAnswerController {
     {
         return scenarioAnswerService.getMaxAnswerOrderId(scenarioQuestionId, companySiteId);
     }
+
+    @RequestMapping(value="/delete", method = RequestMethod.POST)
+    public ResponseEntity<ResultDTO> deleteQuestion(@RequestBody ScenarioAnswerDTO answerDTO) {
+        ResultDTO resultDTO = scenarioAnswerService.delete(answerDTO);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
 }

src/main/java/com/viettel/campaign/web/rest/ScenarioQuestionController.java

@@ -44,4 +44,9 @@ public class ScenarioQuestionController {
         return scenarioQuestionService.countDuplicateQuestionCode(code, scenarioId, campaignId, companySiteId);
     }
 
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public ResponseEntity<ResultDTO> deleteQuestion(@RequestBody ScenarioQuestionDTO scenarioQuestionDTO) {
+        ResultDTO resultDTO = scenarioQuestionService.delete(scenarioQuestionDTO);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
 }

src/main/resources/application.yml

 server:
-  port: 9999
+  port: 1111
 spring:
   application:
     name: campaign
-#  datasource:
-#      driver-class-name: oracle.jdbc.driver.OracleDriver
-#      url: jdbc:oracle:thin:@10.60.157.135:1521:vt
-#      username: CCMS_FULL
-#      password: CCMS_FULL#123
-#      max_pool_size: 32
-#    datasource2:
-#      driver-class-name: oracle.jdbc.driver.OracleDriver
-#      url: jdbc:oracle:thin:@10.60.157.135:1521:vt
-#      username: ACD_FULL
-#      password: ACD_FULL#123
-#      max_pool_size: 32
   jpa:
     database-platform: org.hibernate.dialect.Oracle10gDialect
     show-sql: true

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