phipd commit

src/main/java/com/viettel/campaign/model/CustomerContact.java

+package com.viettel.campaign.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Entity
+@Table(name = "CUSTOMER_CONTACT")
+@Getter
+@Setter
+public class CustomerContact {
+    @Id
+    @Basic(optional = false)
+    @NotNull
+    @Column(name = "CONTACT_ID")
+    private Long contactId;
+    @Column(name = "CUSTOMER_ID")
+    private Long customerId;
+    @Column(name = "CONTACT_TYPE")
+    private Short contactType;
+    @Column(name = "CONTACT")
+    private String contact;
+    @Column(name = "IS_DIRECT_LINE")
+    private Short isDirectLine;
+    @Column(name = "STATUS")
+    private Short status;
+    @Column(name = "CREATE_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date createDate;
+    @Column(name = "UPDATE_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date updateDate;
+    @Column(name = "CREATE_BY")
+    private String createBy;
+    @Column(name = "UPDATE_BY")
+    private String updateBy;
+    @Column(name = "START_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date startDate;
+    @Column(name = "END_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date endDate;
+}

src/main/java/com/viettel/campaign/repository/CustomerContactRepository.java

+package com.viettel.campaign.repository;
+
+import com.viettel.campaign.model.CustomerContact;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface CustomerContactRepository extends JpaRepository<CustomerContact, Long> {
+    List<CustomerContact> findByCustomerIdAndAndContactTypeAndContact(Long customerId, Short contactType, String contact);
+}

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

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

src/main/java/com/viettel/campaign/repository/impl/CampaignRepositoryImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Repository;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -37,18 +38,17 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO result = new ResultDTO();
         List<CampaignDTO> lst = new ArrayList<>();
         StringBuilder expression = new StringBuilder()
-                .append(" SELECT C.CAMPAIGN_CODE, C.CAMPAIGN_NAME, C.CONTENT, C.START_TIME, C.END_TIME, C.STATUS ")
+                .append(" SELECT C.CAMPAIGN_CODE, C.CAMPAIGN_NAME, C.CONTENT, C.START_TIME, C.END_TIME, C.STATUS, CA.STATUS AS AGENT_STATUS ")
                 .append(" FROM CAMPAIGN C INNER JOIN CAMPAIGN_AGENT CA ON C.CAMPAIGN_ID = CA.CAMPAIGN_ID ")
-                .append(" WHERE 1 = 1 ")
+                .append(" WHERE 1 = 1 ");
                 //.append(" AND CA.AGENT_ID = :pAgentId ")
-                .append(" AND C.STATUS IN (2,3) ");
 
         if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignCode())) {
-            expression.append(" AND C.CAMPAIGN_ID IN (:pCampaingId) ");
+            expression.append(" AND C.CAMPAIGN_CODE IN (:pCampaignCode) ");
         }
 
         if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignName())) {
-            expression.append(" AND UPPER(C.CAMPAIGN_NAME) LIKE CONCAT('%',:pCampaignName,'%') ");
+            expression.append(" AND UPPER(C.CAMPAIGN_NAME) LIKE :pCampaignName ");
         }
 
         if (!DataUtil.isNullOrZero(campaignRequestDto.getStatus().longValue())) {
@@ -88,40 +88,45 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
             if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignCode())) {
                 String[] lstCode = campaignRequestDto.getCampaignCode().split(",");
-                query.setParameter(":pCampaingId", lstCode);
+                query.setParameter("pCampaignCode", lstCode);
             }
 
             if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignName())) {
-                query.setParameter(":pCampaignName", campaignRequestDto.getCampaignName().toUpperCase());
+                query.setParameter("pCampaignName", "%" +
+                        campaignRequestDto.getCampaignName().toUpperCase()
+                                .replace("\\", "\\\\")
+                                .replaceAll("%", "\\\\%")
+                                .replaceAll("_", "\\\\_")
+                        + "%");
             }
 
             if (!DataUtil.isNullOrZero(campaignRequestDto.getStatus().longValue())) {
                 if (campaignRequestDto.getStatus() != 0)
-                    query.setParameter(":pStatus", campaignRequestDto.getStatus());
+                    query.setParameter("pStatus", campaignRequestDto.getStatus());
             }
 
             if (!DataUtil.isNullOrEmpty(campaignRequestDto.getFromDateFr())) {
-                query.setParameter(":pStartTimeFr", campaignRequestDto.getFromDateFr());
+                query.setParameter("pStartTimeFr", campaignRequestDto.getFromDateFr());
             }
 
             if (!DataUtil.isNullOrEmpty(campaignRequestDto.getFromDateTo())) {
-                query.setParameter(":pStartTimeTo", campaignRequestDto.getFromDateTo());
+                query.setParameter("pStartTimeTo", campaignRequestDto.getFromDateTo());
             }
 
             if (!DataUtil.isNullOrEmpty(campaignRequestDto.getToDateFr())) {
-                query.setParameter(":pEndTimeFr", campaignRequestDto.getToDateFr());
+                query.setParameter("pEndTimeFr", campaignRequestDto.getToDateFr());
             }
 
             if (!DataUtil.isNullOrEmpty(campaignRequestDto.getToDateTo())) {
-                query.setParameter(":pEndTimeTo", campaignRequestDto.getToDateTo());
+                query.setParameter("pEndTimeTo", campaignRequestDto.getToDateTo());
             }
 
             if (!DataUtil.isNullOrZero(campaignRequestDto.getNumOfCusFr())) {
-                query.setParameter(":pCustNumFr", campaignRequestDto.getNumOfCusFr());
+                query.setParameter("pCustNumFr", campaignRequestDto.getNumOfCusFr());
             }
 
             if (!DataUtil.isNullOrZero(campaignRequestDto.getNumOfCusTo())) {
-                query.setParameter(":pCustNumTo", campaignRequestDto.getNumOfCusTo());
+                query.setParameter("pCustNumTo", campaignRequestDto.getNumOfCusTo());
             }
 
             result.setTotalRow(query.getResultList().size());
@@ -144,7 +149,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 item.setContent((String) obj[2]);
                 item.setStartTime((Date) obj[3]);
                 item.setEndTime((Date) obj[4]);
-                item.setStatus(((Short) obj[5]));
+                item.setStatus(((BigDecimal) obj[5]).shortValueExact());
+                item.setAgentStatus(((BigDecimal) obj[6]).shortValueExact());
 
                 lst.add(item);
             }

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

@@ -12,6 +12,8 @@ public interface CustomerService {
 
     ResultDTO listAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId);
 
+    ResultDTO getCustomerId(Long customerId);
+
     Map listCustByName(int page, int pageSize, String sort, String name);
 
     ResultDTO createCustomer(CustomerDTO customerDTO);
@@ -32,5 +34,13 @@ public interface CustomerService {
 
     ResultDTO deleteCustomerListIds(CustomerRequestDTO customerRequestDTO);
 
+<<<<<<< HEAD
     ResultDTO searchCustomerList(SearchCustomerRequestDTO searchCustomerRequestDTO);
+=======
+    ResultDTO searchCustomerList(CampaignCustomerRequestDTO campaignCustomerRequestDTO);
+
+    // ------------ customer contact ------------ //
+
+    ResultDTO getCustomerContact(Long customerId, Short contactType, String contact);
+>>>>>>> 34ea2d6ca2abb80539da3dd29437f08fed559e93
 }

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

 package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.mapper.CustomerListMapper;
+import com.viettel.campaign.model.CustomerContact;
 import com.viettel.campaign.model.CustomerList;
-import com.viettel.campaign.repository.CampaignCustomerListRepository;
-import com.viettel.campaign.repository.CustomerListMappingRepository;
-import com.viettel.campaign.repository.CustomerListRepository;
+import com.viettel.campaign.repository.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.HibernateUtil;
@@ -15,7 +14,6 @@ import com.viettel.campaign.web.dto.CustomerListDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.CustomerMapper;
 import com.viettel.campaign.model.Customer;
-import com.viettel.campaign.repository.CustomerRepository;
 import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
@@ -48,6 +46,9 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     CustomerListRepository customerListRepository;
 
+    @Autowired
+    CustomerContactRepository customerContactRepository;
+
     @Autowired
     CampaignCustomerListRepository campaignCustomerListRepository;
 
@@ -127,6 +128,24 @@ public class CustomerServiceImpl implements CustomerService {
         return resultDTO;
     }
 
+    @Override
+    public ResultDTO getCustomerId(Long customerId) {
+        ResultDTO resultDTO = new ResultDTO();
+
+        List<Customer> customer = customerRepository.findByCustomerId(customerId);
+
+        if (customer != null) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription("customer data");
+            resultDTO.setListData(customer);
+        } else {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription("customer data null");
+        }
+
+        return resultDTO;
+    }
+
     @Override
     public Map listCustByName(int page, int pageSize, String sort, String name) {
         Map result = new HashMap();
@@ -451,4 +470,22 @@ public class CustomerServiceImpl implements CustomerService {
 
         return resultDTO;
     }
+
+    @Override
+    public ResultDTO getCustomerContact(Long customerId, Short contactType, String contact) {
+        ResultDTO result = new ResultDTO();
+
+        List<CustomerContact> customer = customerContactRepository.findByCustomerIdAndAndContactTypeAndContact(customerId, contactType, contact);
+
+        if (customer != null) {
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setDescription("customer contact data");
+            result.setListData(customer);
+        } else {
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription("customer contact data null");
+        }
+
+        return result;
+    }
 }

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

@@ -57,6 +57,5 @@ public class CampaignDTO extends BaseDTO {
     private Long numOfNotJoinedCus;
     private Long numOfLockCus;
     private String campaignTypeName;
-
-
+    private Short agentStatus;
 }

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

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class CustomerContactDTO {
+    private Long contactId;
+    private Long customerId;
+    private Short contactType;
+    private String contact;
+    private Short isDirectLine;
+    private Short status;
+    private Date createDate;
+    private Date updateDate;
+    private String createBy;
+    private String updateBy;
+    private Date startDate;
+    private Date endDate;
+}

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

@@ -33,6 +33,13 @@ public class CustomerController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @GetMapping("/findCustomerId")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> findAllCustomerName(@RequestParam("customerId") Long customerId) {
+        ResultDTO result = customerService.getCustomerId(customerId);
+        return new ResponseEntity(result, HttpStatus.OK);
+    }
+
     @GetMapping("/findCustomerByName")
     @ResponseBody
     public ResponseEntity findAllCustomerName(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort, @RequestParam("name") String name) {
@@ -145,4 +152,11 @@ public class CustomerController {
         ResultDTO result = customerService.searchCustomerList(searchCustomerRequestDTO);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
+
+    @GetMapping("/findCustomerContact")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> findAllCustomerContact(@RequestParam("customerId") Long customerId, @RequestParam("contactType") Short contactType, @RequestParam("contact") String contact) {
+        ResultDTO result = customerService.getCustomerContact(customerId, contactType, contact);
+        return new ResponseEntity(result, HttpStatus.OK);
+    }
 }