Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/viettel/campaign/service/CustomerService.java

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

@@ -2,16 +2,15 @@ package com.viettel.campaign.service;
 
 import com.viettel.campaign.model.ccms_full.Customer;
 import com.viettel.campaign.model.ccms_full.CustomerList;
-import com.viettel.campaign.web.dto.CustomerContactDTO;
-import com.viettel.campaign.web.dto.CustomerDTO;
-import com.viettel.campaign.web.dto.CustomerListDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 
 import java.util.Date;
 import java.util.List;
 
+import java.util.List;
+
 public interface CustomerService {
 
     ResultDTO getAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId);
@@ -48,7 +47,9 @@ public interface CustomerService {
 
     // danh sach khach hang cua chien dich //
 
-    ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId);
+    List<CustomerListDTO> getCustomerListInfo(CampaignCustomerDTO campaignCustomerDTO);
+
+    List<CustomerDTO> getIndividualCustomerInfo(CampaignCustomerDTO campaignCustomerDTO);
 
 
     // ------------ customer  ------------ //

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

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.config.CCMSFullDatasourceConfig;
 import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.mapper.CustomerListMapper;
 import com.viettel.campaign.mapper.CustomerMapper;
@@ -24,15 +25,20 @@ import org.hibernate.type.LongType;
 import org.hibernate.type.ShortType;
 import org.hibernate.type.StringType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.domain.*;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
-import java.util.Date;
-import java.util.List;
+import javax.sql.DataSource;
+import java.util.*;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
@@ -59,6 +65,10 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     CustomerListMappingRepository customerListMappingRepository;
 
+    @Autowired
+    @Qualifier(DataSourceQualify.NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL)
+    NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO getAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId) {
@@ -94,6 +104,10 @@ public class CustomerServiceImpl implements CustomerService {
             query.addScalar("companyName", new StringType());
             query.addScalar("customerType", new StringType());
             query.addScalar("currentAddress", new StringType());
+            query.addScalar("callAllowed", new ShortType());
+            query.addScalar("emailAllowed", new ShortType());
+            query.addScalar("smsAllowed", new ShortType());
+            query.addScalar("ipccStatus", new StringType());
             query.addScalar("mobileNumber", new StringType());
             query.addScalar("email", new StringType());
 
@@ -666,21 +680,35 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId) {
-        ResultDTO resultDTO = new ResultDTO();
+    public List<CustomerListDTO> getCustomerListInfo(CampaignCustomerDTO campaignCustomerDTO) {
+        List<CustomerListDTO> customerList;
         try {
             String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "search-customer-list-info-from-customer-list");
-            Query query = entityManager.createNativeQuery(sql);
-            query.setParameter("p_campaign_id", campaignId);
-            query.setParameter("p_company_site_id", companySiteId);
-            resultDTO.setListData(query.getResultList());
-            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            Map<String, Object> param = new HashMap<>();
+            param.put("p_campaign_id", campaignCustomerDTO.getCampaignId());
+            param.put("p_company_site_id", campaignCustomerDTO.getCompanySiteId());
+            param.put("p_page_number", campaignCustomerDTO.getPage());
+            param.put("p_page_size", campaignCustomerDTO.getPageSize());
+            customerList = namedParameterJdbcTemplate.query(sql, param, new BeanPropertyRowMapper<>(CustomerListDTO.class));
         } catch (Exception e) {
-            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
-            resultDTO.setDescription(e.getMessage());
+            return null;
         }
-        return resultDTO;
+        return customerList;
+    }
+
+    @Override
+    public List<CustomerDTO> getIndividualCustomerInfo(CampaignCustomerDTO campaignCustomerDTO) {
+        List<CustomerDTO> customerList;
+        try {
+            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "search-individual-customer");
+            Map<String, Object> param = new HashMap<>();
+            param.put("p_page_number", campaignCustomerDTO.getPage());
+            param.put("p_page_size", campaignCustomerDTO.getPageSize());
+            customerList = namedParameterJdbcTemplate.query(sql, param, new BeanPropertyRowMapper<>(CustomerDTO.class));
+        } catch (Exception e) {
+            return null;
+        }
+        return customerList;
     }
 
     @Override

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

@@ -7,7 +7,7 @@ import java.util.Date;
 
 @Getter
 @Setter
-public class CampaignCustomerDTO {
+public class CampaignCustomerDTO extends BaseDTO{
     private Long campaignCustomerListId;
     private Long campaignId;
     private Long customerId;

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

@@ -15,6 +15,10 @@ public class CustomerCustomDTO {
     String companyName;
     String customerType;
     String currentAddress;
+    Short callAllowed;
+    Short emailAllowed;
+    Short smsAllowed;
+    String ipccStatus;
     String mobileNumber;
     String email;
 }

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

@@ -21,4 +21,7 @@ public class CustomerListDTO extends BaseDTO {
     private Date updateAt;
     private String source;
     private String deptCreate;
+    private Long totalCusInList;
+    private Long totalCusInteract;
+    private Long totalCusNotInteract;
 }

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

 package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.web.dto.CustomerContactDTO;
-import com.viettel.campaign.web.dto.CustomerDTO;
-import com.viettel.campaign.web.dto.CustomerListDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
@@ -12,6 +9,7 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -242,12 +240,15 @@ public class CustomerController {
         }
     }
 
-    @RequestMapping(value = "/searchCustomerListInfoFromCustomerList", method = RequestMethod.GET)
-    public ResultDTO searchCustomerListInfoFromCustomerList(@RequestParam("page") int page,
-                                                            @RequestParam("pageSize") int pageSize,
-                                                            @RequestParam("sort") String sort,
-                                                            @RequestParam("campaignId") Long campaignId,
-                                                            @RequestParam("companySiteId") Long companySiteId) {
-        return customerService.searchCustomerListInfoFromCustomerList(page, pageSize, sort, campaignId, companySiteId);
+    @PostMapping("/getCustomerListInfo")
+    public ResponseEntity<?> getCustomerListInfo(@RequestBody CampaignCustomerDTO campaignCustomerDTO) {
+        List<CustomerListDTO> data = customerService.getCustomerListInfo(campaignCustomerDTO);
+        return new ResponseEntity<>(data, HttpStatus.OK);
+    }
+
+    @PostMapping("/getIndividualCustomerInfo")
+    public ResponseEntity<?> getIndividualCustomerInfo(@RequestBody CampaignCustomerDTO dto) {
+        List<CustomerDTO> data = customerService.getIndividualCustomerInfo(dto);
+        return new ResponseEntity<>(data, HttpStatus.OK);
     }
 }

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

@@ -8,6 +8,10 @@ select
     b.COMPANY_NAME companyName,
     b.CUSTOMER_TYPE customerType,
     b.CURRENT_ADDRESS currentAddress,
+    b.CALL_ALLOWED callAllowed,
+    b.EMAIL_ALLOWED emailAllowed,
+    b.SMS_ALLOWED smsAllowed,
+    b.IPCC_STATUS ipccStatus,
     c.MOBILE mobileNumber,
     d.EMAIL email
 from CUSTOMER_LIST_MAPPING a

src/main/resources/sql/campaign-mng/search-customer-list-info-from-customer-list.sql

@@ -19,16 +19,26 @@ count(customer_id) ktt
 from campaign_customer where campaign_id = :p_campaign_id and status = 0
 and in_campaign_status = 1
 group by customer_list_id, company_site_id
-)
-select customer_list_code ma,
-customer_list_name ten,
-cl.company_site_id,
-nvl(total, 0) tong,
-nvl(tt, 0) tongtt,
-nvl(ktt, 0) tongktt
+), datas as (
+select customer_list_code customerListCode,
+customer_list_name customerListName,
+nvl(total, 0) totalCusInList,
+nvl(tt, 0) totalCusInteract,
+nvl(ktt, 0) totalCusNotInteract
 from customer_list cl
 left join totalCustomer tc on (cl.customer_list_id = tc.customer_list_id and cl.company_site_id = tc.company_site_id)
 left join customerInteractive ci on (cl.customer_list_id = ci.customer_list_id and cl.company_site_id = ci.company_site_id)
 left join customerNotInteractive cni on (cl.customer_list_id = cni.customer_list_id and cl.company_site_id = cni.company_site_id)
 where cl.company_site_id = :p_company_site_id
-order by customer_list_code
\ No newline at end of file
+)
+select * from
+(
+    select a.*, rownum r__
+    from
+    (
+        select * from datas
+        order by customerListCode
+    ) a
+    where rownum < ((:p_page_number * :p_page_size) + 1 )
+)
+where r__ >= (((:p_page_number-1) * :p_page_size) + 1)
\ No newline at end of file

src/main/resources/sql/campaign-mng/search-individual-customer.sql

+with cusPhone as (
+select customer_id cusId,
+contact phone
+from customer_contact cc
+where cc.contact_type = 5
+and status = 1
+), cusEmail as (
+select customer_id cusId,
+contact email
+from customer_contact cc
+where cc.contact_type = 2
+and status = 1
+), datas as (
+select c.name,
+cP.phone,
+cE.email,
+c.customer_type cusType,
+c.company_name compName,
+c.current_address currentAddress,
+c.description
+from customer c
+left join cusPhone cP on c.customer_id = cP.cusId
+left join cusEmail cE on c.customer_id = cE.cusId
+)
+select * from
+(
+    select a.*, rownum r__
+    from
+    (
+        select * from datas
+        order by datas.name
+    ) a
+    where rownum < ((:p_page_number * :p_page_size) + 1 )
+)
+where r__ >= (((:p_page_number-1) * :p_page_size) + 1)
\ No newline at end of file