Merge remote-tracking branch 'origin/master'

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

@@ -11,23 +11,16 @@ import java.util.List;
 public interface CustomerListMappingRepository extends JpaRepository<CustomerListMapping, Long> {
 
     // ----------- customer ------------ //
+
     @Query("select c from CustomerListMapping c where c.customerId in (:p_ids) and c.customerListId =:p_customer_list_id and c.companySiteId=:p_company_site_id")
     List<CustomerListMapping> findAllCustomerListMapping(@Param("p_ids") List<Long> p_ids, @Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);
 
-    @Modifying
-    @Query("delete from CustomerListMapping c where c.customerId=:p_customer_id and c.customerListId=:p_customer_list_id and c.companySiteId=:p_company_site_id")
-    int deleteMappingByCustomerId(@Param("p_customer_id") Long p_customer_id, @Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);
-
     @Modifying
     @Query("delete from CustomerListMapping c where c.customerId in (:p_ids) and c.customerListId =:p_customer_list_id and c.companySiteId=:p_company_site_id")
     int deleteMappingByCustomerIds(@Param("p_ids") List<Long> p_ids, @Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);
 
     // ----------- customer list --------------- //
 
-    @Modifying
-    @Query("delete from CustomerListMapping c where c.customerListId=:p_customer_list_id and c.companySiteId=:p_company_site_id")
-    int deleteMappingByCustomerListId(@Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);
-
     @Modifying
     @Query("delete from CustomerListMapping c where c.customerListId in (:p_ids) and c.companySiteId=:p_company_site_id")
     int deleteMappingByCustomerListIds(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);

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

@@ -17,14 +17,7 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
     @Query("select c from CustomerList c where c.customerListId in (:p_ids) and c.companySiteId=:p_company_site_id and c.status = 1")
     List<CustomerList> findAllCustomerList(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
 
-    @Modifying
-    @Query("update CustomerList c set c.status = 0 where c.customerListId=:p_customer_list_id and c.companySiteId=:p_company_site_id")
-    int deleteCustomerList(@Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);
-
     @Modifying
     @Query("update CustomerList c set c.status = 0 where c.customerListId in (:p_ids) and c.companySiteId=:p_company_site_id")
     int deleteCustomerListIds(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
-
-    @Query(value = "SELECT * FROM (SELECT c.*, MAX(c.CREATE_AT) OVER() AS LATEST_CREATED FROM CUSTOMER_LIST c) WHERE CREATE_AT = LATEST_CREATED AND COMPANY_SITE_ID =:p_company_site_id", nativeQuery = true)
-    CustomerList latestCreated(@Param("p_company_site_id") Long p_company_site_id);
 }

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

@@ -19,6 +19,8 @@ public interface CustomerRepository extends JpaRepository<Customer, Long>, Custo
 
     Page<Customer> findAll(Pageable pageable);
 
+    Customer getByCustomerId(Long customerId);
+
     List<Customer> findByCustomerId(Long customerId);
 
     @Query("FROM Customer WHERE name = ?1")

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

 package com.viettel.campaign.repository.ccms_full;
 
-import com.viettel.campaign.web.dto.CustomerCustomDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerDetailRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
+import com.viettel.econtact.filter.UserSession;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
@@ -12,4 +13,12 @@ public interface CustomerRepositoryCustom {
     List<CustomerDetailRequestDTO> getCustomerDetailById(Long companySiteId, Long customerListId, Long customerId);
 
     List<CustomerCustomDTO> getAllCustomerByParams(SearchCustomerRequestDTO searchCustomerRequestDTO, Pageable pageable);
+
+    List<CampaignInformationDTO> getCampaignInformation(CampaignCustomerDTO campaignCustomerDTO);
+
+    List<CustomerDTO> getIndividualCustomerInfo(CampaignCustomerDTO campaignCustomerDTO);
+
+    List<CustomerListDTO> getCustomerListInfo(CampaignCustomerDTO campaignCustomerDTO);
+
+    List<CustomerDTO> getCustomizeFields(CampaignCustomerDTO campaignCustomerDTO, UserSession userSession, Pageable pageable);
 }

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

@@ -15,4 +15,6 @@ import java.util.List;
 public interface CustomerTimeRepository extends JpaRepository<CustomerTime, Long> {
 
     List<CustomerTime> findByCustomerId(Long customerId);
+
+    CustomerTime findByCompanySiteIdAndCustomerId(Long companySiteId, Long customerId);
 }

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

@@ -4,4 +4,5 @@ import com.viettel.campaign.model.ccms_full.ReceiveCustLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ReceiveCustLogRepository extends JpaRepository<ReceiveCustLog, Long> {
+    ReceiveCustLog getByReceiveCustLogId(Long receiveCustLogId);
 }

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

@@ -105,6 +105,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
     public List<ContactCustResultDTO> getInteractiveResult(CampaignRequestDTO dto, Pageable pageable) {
         ResultDTO resultDTO = new ResultDTO();
         List<ContactCustResultDTO> list = new ArrayList<>();
+        TimeZone tzClient = TimeZoneUtils.getZoneMinutes(dto.getTimezone());
 
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
         Session session = sessionFactory.openSession();
@@ -125,7 +126,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             sql.append("    CC2.COMPLETE_NAME               AS surveyStatus, ");
             sql.append("    C.STATUS                        AS status, ");
             sql.append("    CCR.STATUS                      AS recordStatus, ");
-            sql.append("    (( CCR.END_TIME - CCR.START_CALL ) * 24 * 60 * 60) AS callTime, ");
+            sql.append("    ROUND(( CCR.END_TIME - CCR.START_CALL ) * 24 * 60 * 60) AS callTime, ");
             sql.append("    C.CAMPAIGN_ID                   AS campaignId, ");
             sql.append("    CUS.CUSTOMER_ID                 AS customerId ");
             sql.append("FROM CONTACT_CUST_RESULT CCR ");
@@ -133,11 +134,11 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             sql.append("    INNER JOIN VSA_USERS                VU ON CCR.AGENT_ID = VU.USER_ID ");
             sql.append("    INNER JOIN CUSTOMER                 CUS ON CCR.CUSTOMER_ID = CUS.CUSTOMER_ID ");
             sql.append("    INNER JOIN CAMPAIGN_COMPLETE_CODE   CC1 ON CCR.CONTACT_STATUS = CC1.COMPLETE_VALUE ");
-            sql.append("    LEFT JOIN CAMPAIGN_COMPLETE_CODE   CC2 ON CCR.CALL_STATUS = CC2.COMPLETE_VALUE ");
+            sql.append("    LEFT JOIN CAMPAIGN_COMPLETE_CODE    CC2 ON CCR.CALL_STATUS = CC2.COMPLETE_VALUE ");
             sql.append("WHERE CCR.STATUS <> 0 ");
             sql.append("  AND CCR.COMPANY_SITE_ID = :p_company_site_id ");
-            sql.append("  AND to_date(CCR.CREATE_TIME, 'DD/MM/RR') >= to_date(:p_date_from, 'DD/MM/RR') ");
-            sql.append("  AND to_date(CCR.CREATE_TIME, 'DD/MM/RR') <= to_date(:p_date_to, 'DD/MM/RR') ");
+            sql.append("  AND to_date(CCR.CREATE_TIME, 'DD/MM/RR') >= to_date(:p_date_from, 'DD/MM/YYYY HH24:MI:SS') ");
+            sql.append("  AND to_date(CCR.CREATE_TIME, 'DD/MM/RR') <= to_date(:p_date_to, 'DD/MM/YYYY HH24:MI:SS') ");
 
             if (!DataUtil.isNullOrEmpty(dto.getCustomerId())) {
                 sql.append(" AND CCR.CUSTOMER_ID LIKE (:p_customer_id) ");
@@ -185,8 +186,10 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
 
             SQLQuery query = session.createSQLQuery(sql.toString());
             query.setParameter("p_company_site_id", dto.getCompanySiteId());
-            query.setParameter("p_date_from", dto.getFromDate());
-            query.setParameter("p_date_to", dto.getToDate());
+            //query.setParameter("p_date_from", dto.getFromDate());
+            query.setParameter("p_date_from", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("dd/MM/yyyy", dto.getFromDate()), tzClient));
+            //query.setParameter("p_date_to", dto.getToDate());
+            query.setParameter("p_date_to", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("dd/MM/yyyy", dto.getToDate()), tzClient));
 
             if (!DataUtil.isNullOrEmpty(dto.getCustomerId())) {
                 query.setParameter("p_customer_id", "%" +
@@ -523,8 +526,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setParameter("pCampaignName", "%" +
                         campaignRequestDto.getCampaignName().toUpperCase()
                                 .replace("\\", "\\\\")
-                                .replaceAll("%", "\\\\%")
-                                .replaceAll("_", "\\\\_")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
                         + "%");
             }
 

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

@@ -35,14 +35,10 @@ public interface CustomerService {
 
     ResultDTO updateCustomerList(CustomerListDTO customerListDTO, String userName);
 
-    ResultDTO deleteCustomerList(CustomerListDTO customerListDTO);
-
     ResultDTO deleteCustomerListIds(CustomerRequestDTO customerRequestDTO);
 
     ResultDTO searchCustomerList(SearchCustomerListRequestDTO searchCustomerListRequestDTO);
 
-    CustomerList getLatestCreated(Long companySiteId);
-
     // ------------ customer contact ------------ //
 
     ResultDTO getCustomerContact(CustomerContactDTO customer);

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

@@ -28,7 +28,7 @@ public interface ScenarioService {
 
     XSSFWorkbook buildTemplate() throws IOException;
 
-    Map<String, Object> readAndValidateCustomer(String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException;
+    Map<String, Object> readAndValidateScenario(String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException;
 
     List<ContactQuestResult> getContactQuestResult(Long companySiteId, Long campaignId, Long customerId);
 }

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

@@ -383,14 +383,18 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
     public ResultDTO getListStatus(String completeValue, Short completeType, Long companySiteId) {
         ResultDTO resultDTO = new ResultDTO();
         List<CampaignCfg> list = new ArrayList<>();
+        CampaignCfg cfg = new CampaignCfg();
 
         try {
             if (completeValue == null || completeValue.equalsIgnoreCase("null"))
                 list = completeCodeRepository.getCustomerStatusByType(completeType, companySiteId);
+            else if (completeType == null)
+                cfg = completeCodeRepository.findByCompanySiteIdAndCompleteValue(companySiteId, completeValue);
             else
                 list = completeCodeRepository.getCustomerStatus(completeValue, completeType, companySiteId);
 
             resultDTO.setListData(list);
+            resultDTO.setData(cfg);
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
         } catch (Exception e) {

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

@@ -80,7 +80,6 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
             if (scenarioQuestionDTO.getLstAnswers().size() > 0) {
                 lstAnswers = scenarioQuestionDTO.getLstAnswers();
                 lstAnswers.forEach(item -> {
-                    item.setCode(scenarioQuestion.getCode() + "_" + item.getOrderIndex());
                     item.setScenarioQuestionId(scenarioQuestion.getScenarioQuestionId());
                     item.setCreateTime(new Date());
                     item.setStatus((short) 1);

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

@@ -254,7 +254,7 @@ public class ScenarioServiceImpl implements ScenarioService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public Map<String, Object> readAndValidateCustomer (String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException{
+    public Map<String, Object> readAndValidateScenario (String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException{
         Locale locale = new Locale("vi", "VN");
         SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         Map<String, Object> result = new HashMap<>();
@@ -551,6 +551,7 @@ public class ScenarioServiceImpl implements ScenarioService {
         lstQuestions.forEach(q2 -> {
             List<ScenarioAnswerDTO> lstAnswers = q2.getLstAnswers();
             lstAnswers.forEach(a2 -> {
+                a2.setCode(q2.getCode() + "_" + a2.getOrderIndex());
                 ScenarioQuestionDTO mappingQuestion = lstQuestions.stream().filter(mq -> mq.getImportCode().equals(a2.getMappingQuestionCode())).findFirst().orElse(null);
                 if (mappingQuestion != null) {
                     a2.setMappingQuestionCode(mappingQuestion.getCode());

src/main/java/com/viettel/campaign/web/dto/CampaignCustomerDTO.java

@@ -18,6 +18,7 @@ public class CampaignCustomerDTO extends BaseDTO{
     private Date recallTime;
     private Long recallCount = 0L;
     private Date callTime;
+    private Long callTimeL;
     private Long customerListId;
     private Short inCampaignStatus;
     private Date sendTime;

src/main/java/com/viettel/campaign/web/dto/ContactCustResultDTO.java

@@ -40,7 +40,8 @@ public class ContactCustResultDTO extends BaseDTO {
     private Short isFinalRecall;
     private Short isSendEmail = 0;
     private Long saledOnTpin;
-    private Long endTime; // api get call return Long
+    private Long endTimeL; // api get call return Long
+    private Date endTime;
     // private Date endTime;
     private Long waitTime;
     private String dialMode;
@@ -59,4 +60,5 @@ public class ContactCustResultDTO extends BaseDTO {
 
     private Integer totalRow;
     private String eventCall;
+    private Boolean checkUpdate = false;
 }

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

@@ -107,14 +107,6 @@ public class CustomerController {
         return customerService.updateCustomerList(customerListDTO, userSession.getUserName());
     }
 
-    @PostMapping("/deleteCustomerList")
-    @ResponseBody
-    public ResultDTO deleteCustomerList(@RequestBody @Valid CustomerListDTO customerListDTO) {
-        ResultDTO result = new ResultDTO();
-        result = customerService.deleteCustomerList(customerListDTO);
-        return result;
-    }
-
     @PostMapping("/deleteCustomerListIds")
     @ResponseBody
     public ResultDTO deleteCustomerListIds(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
@@ -129,14 +121,6 @@ public class CustomerController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @GetMapping("/latestCreated")
-    @ResponseBody
-    public ResponseEntity getLatestCreated(@RequestParam("companySiteId") Long companySiteId) {
-        ResultDTO result = new ResultDTO();
-        result.setData(customerService.getLatestCreated(companySiteId));
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
     @PostMapping("/findCustomerContact")
     @ResponseBody
     public ResponseEntity<ResultDTO> findAllCustomerContact(@RequestBody CustomerContactDTO customerContactDTO) {

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

@@ -118,7 +118,7 @@ public class ScenarioController {
                 return new ResponseEntity<>(BundleUtils.getLangString("common.fileInvalidFormat", locale), HttpStatus.OK);
             }
             String path = saveUploadFile(file);
-            Map<String, Object> map = scenarioService.readAndValidateCustomer(path, scenarioId, campaignId, userSession.getCompanySiteId());
+            Map<String, Object> map = scenarioService.readAndValidateScenario(path, scenarioId, campaignId, userSession.getCompanySiteId());
             String code = (String) map.get("code");
             byte[] content = (byte[]) map.get("content");
             return ResponseEntity.ok()