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

# Conflicts:
#	src/main/java/com/viettel/campaign/repository/impl/CampaignRepositoryImpl.java
#	src/main/java/com/viettel/campaign/service/CustomerService.java
#	src/main/java/com/viettel/campaign/web/dto/CampaignDTO.java

campaign.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="ExternalSystem" externalSystem="Maven" />
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />
@@ -35,6 +34,7 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" name="Maven: org.modelmapper:modelmapper:2.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.0.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.6.RELEASE" level="project" />
@@ -208,5 +208,6 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
+    <orderEntry type="library" name="Maven: org.modelmapper:modelmapper:2.3.2" level="project" />
   </component>
 </module>
\ No newline at end of file

pom.xml

@@ -183,6 +183,12 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.modelmapper</groupId>
+            <artifactId>modelmapper</artifactId>
+            <version>2.3.2</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/viettel/campaign/config/ModelMapperConfig.java

+package com.viettel.campaign.config;
+
+import org.modelmapper.ModelMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author anhvd_itsol
+ */
+@Configuration
+public class ModelMapperConfig {
+    @Bean
+    public ModelMapper modelMapper() {
+        return new ModelMapper();
+    }
+}

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

@@ -6,7 +6,6 @@ import lombok.Setter;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 @Entity
@@ -19,23 +18,23 @@ public class Campaign implements Serializable {
     @NotNull
     @Basic(optional = false)
     @Column(name = "CAMPAIGN_ID")
-    private BigDecimal campaignId;
+    private Long campaignId;
     @Column(name = "COMPANY_SITE_ID")
-    private BigDecimal companySiteId;
+    private Long companySiteId;
     @Column(name = "CAMPAIGN_CODE")
     private String campaignCode;
     @Column(name = "CAMPAIGN_NAME")
     private String campaignName;
     @Column(name = "CHANEL")
-    private BigDecimal chanel;
+    private Long chanel;
     @Column(name = "CONTENT")
     private String content;
     @Column(name = "CUSTOMER_NUMBER")
-    private BigDecimal customerNumber;
+    private Long customerNumber;
     @Column(name = "TARGET")
     private String target;
     @Column(name = "STATUS")
-    private BigDecimal status;
+    private Long status;
     @Temporal(TemporalType.TIMESTAMP)
     @Column(name = "START_TIME")
     private Date startTime;
@@ -65,7 +64,7 @@ public class Campaign implements Serializable {
     @Column(name = "PROCESS_STATUS")
     private Integer processStatus;
     @Column(name = "DIAL_MODE")
-    private BigDecimal dialMode;
+    private Long dialMode;
     @Column(name = "DEPT_CODE")
     private String deptCode;
     @Column(name = "TIME_RANGE")
@@ -73,29 +72,29 @@ public class Campaign implements Serializable {
     @Column(name = "DAY_OF_WEEK")
     private String dayOfWeek;
     @Column(name = "CURRENT_TIME_MODE")
-    private BigDecimal currentTimeModel;
+    private Long currentTimeMode;
     @Column(name = "WRAPUP_TIME_CONNECT")
-    private BigDecimal wrapupTimeConnect;
+    private Long wrapupTimeConnect;
     @Column(name = "WRAPUP_TIME_DISCONNECT")
-    private BigDecimal wrapupTimeDisconnect;
+    private Long wrapupTimeDisconnect;
     @Column(name = "PREVIEW_TIME")
-    private BigDecimal previewTime;
+    private Long previewTime;
     @Column(name = "RATE_DIAL")
-    private BigDecimal rateDial;
+    private Long rateDial;
     @Column(name = "RATE_MISS")
-    private BigDecimal rateMiss;
+    private Long rateMiss;
     @Column(name = "AVG_TIME_PROCESS")
-    private BigDecimal avgTimeProcess;
+    private Long avgTimeProcess;
     @Column(name = "IS_APPLY_CUST_LOCK")
-    private BigDecimal isApplyCustLock;
+    private Long isApplyCustLock;
     @Column(name = "TARGET_TYPE")
-    private BigDecimal targetType;
+    private Long targetType;
     @Column(name = "IS_TARGET")
-    private BigDecimal isTarget;
+    private Long isTarget;
     @Column(name = "CAMPAIGN_IVR_CALLED_ID")
-    private BigDecimal campaignIvrCalledId;
+    private Long campaignIvrCalledId;
     @Column(name = "CONCURRENT_CALL")
-    private BigDecimal concurrentCall;
+    private Long concurrentCall;
     @Column(name = "CALL_OUT_TIME_IN_DAY")
     private String callOutTimeInDay;
     @Column(name = "MUSIC_LIST")
@@ -111,6 +110,6 @@ public class Campaign implements Serializable {
     @Column(name = "TIME_WAIT_AGENT")
     private Integer timeWaitAgent;
     @Column(name = "QUEST_INDEX")
-    private BigDecimal questIndex;
+    private Long questIndex;
 
 }

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

@@ -4,9 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 @Entity
@@ -56,6 +54,6 @@ public class CampaignCompleteCode implements Serializable {
     @Column(name = "DURATION_LOCK")
     private Long durationLock;
     @Column(name = "CHANEL")
-    private BigDecimal chanel;
+    private Long chanel;
 
 }

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

+package com.viettel.campaign.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author anhvd_itsol
+ */
+@Entity
+@Table(name = "TIME_RANGE_DIAL_MODE")
+@Getter
+@Setter
+public class TimeRangeDialMode implements Serializable {
+    @Id
+    @NotNull
+    @Basic(optional = false)
+    @Column(name = "TIME_RANGE_DIAL_MODE_ID")
+    private Long timeRangeDialModeId;
+
+    @Column(name = "COMPANY_SITE_ID")
+    private Long companySiteId;
+
+    @Temporal(TemporalType.DATE)
+    @Column(name = "START_TIME")
+    private Date startTime;
+
+    @Column(name = "CAMPAIGN_ID")
+    private Long campaignId;
+
+    @Column(name = "DIAL_MODE")
+    private Short dialMode;
+
+    @Column(name = "USER_ID")
+    private Long userId;
+}

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

+package com.viettel.campaign.model;
+
+import javax.persistence.Entity;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Entity
+@Table(name = "TIME_ZONE_DIAL_MODE")
+@Getter
+@Setter
+public class TimeZoneDialMode implements Serializable{
+    @Id
+    @NotNull
+    @Basic(optional = false)
+    @Column(name = "TIME_ZONE_DIAL_MODE_ID")
+    private Long timeRangeDialModeId;
+
+    @Column(name = "COMPANY_SITE_ID")
+    private Long companySiteId;
+
+    @Column(name = "HOUR")
+    private String hour;
+
+    @Column(name = "MINUTE")
+    private String minute;
+
+    @Column(name = "CAMPAIGN_ID")
+    private Long campaignId;
+
+    @Column(name = "DIAL_MODE")
+    private Short dialMode;
+
+    @Column(name = "USER_ID")
+    private Long userId;
+}
+
+

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

+package com.viettel.campaign.repository;
+
+import com.viettel.campaign.web.dto.ResultDTO;
+
+public interface CampaignCompleteCodeRepositoryCustom {
+
+    ResultDTO updateStatusById(Long id);
+}

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

@@ -6,9 +6,27 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
+
 public interface CustomerListMappingRepository extends JpaRepository<CustomerListMapping, Long> {
 
+    // ----------- customer ------------ //
+
+    @Modifying
+    @Query("delete from CustomerListMapping c where c.customerId=:p_customer_id and c.customerListId=:p_customer_list_id")
+    int deleteMappingByCustomerId(@Param("p_customer_id") Long p_customer_id, @Param("p_customer_list_id") Long p_customer_list_id);
+
+    @Modifying
+    @Query("delete from CustomerListMapping c where c.customerId in (:p_id) and c.customerListId =:p_customer_list_id")
+    int deleteMappingByCustomerIds(@Param("p_id") List<Long> p_id, @Param("p_customer_list_id") Long p_customer_list_id);
+
+    // ----------- customer list --------------- //
+
+    @Modifying
+    @Query("delete from CustomerListMapping c where c.customerListId=:p_customerListId")
+    int deleteMappingByCustomerListId(@Param("p_customerListId") Long p_customerListId);
+
     @Modifying
-    @Query("delete from CustomerListMapping c where c.customerListId=:customerListId")
-    int deleteMappingByCustomerListId(@Param("customerListId") Long customerListId);
+    @Query("delete from CustomerListMapping c where c.customerListId in (:p_ids)")
+    int deleteMappingByCustomerListIds(@Param("p_ids") List<Long> p_ids);
 }

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

@@ -15,6 +15,10 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
     CustomerList findByCustomerListCode(String customerListCode);
 
     @Modifying
-    @Query("delete from CustomerList c where c.customerListId in (:ids)")
-    int deleteCustomerListIds(@Param("ids") List<Long> ids);
+    @Query("update CustomerList c set c.status = 0 where c.customerListId=:p_customerListId")
+    int deleteCustomerList(@Param("p_customerListId") Long p_customerListId);
+
+    @Modifying
+    @Query("update CustomerList c set c.status = 0 where c.customerListId in (:p_ids)")
+    int deleteCustomerListIds(@Param("p_ids") List<Long> p_ids);
 }

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

+package com.viettel.campaign.repository;
+
+import com.viettel.campaign.model.TimeRangeDialMode;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Repository
+public interface TimeRangeDialModeRepository extends JpaRepository<TimeRangeDialMode, Long> {
+}

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

+package com.viettel.campaign.repository;
+
+import com.viettel.campaign.model.TimeZoneDialMode;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Repository
+public interface TimeZoneDialModeRepository extends JpaRepository<TimeZoneDialMode, Long> {
+}

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

@@ -2,17 +2,14 @@ package com.viettel.campaign.repository.impl;
 
 import com.viettel.campaign.model.CampaignCompleteCode;
 import com.viettel.campaign.repository.CampaignCompleteCodeRepository;
-import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.HibernateUtil;
 import com.viettel.campaign.utils.SQLBuilder;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
-import org.hibernate.Query;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.transform.Transformers;
-import org.hibernate.type.BigDecimalType;
 import org.hibernate.type.LongType;
 import org.hibernate.type.ShortType;
 import org.hibernate.type.StringType;
@@ -23,11 +20,9 @@ import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -73,7 +68,7 @@ public class CampaignCompleteCodeRepositoryIpml implements CampaignCompleteCodeR
             query.addScalar("chanel", new ShortType());
             query.addScalar("description", new StringType());
             query.addScalar("status", new ShortType());
-            query.addScalar("chanel", new BigDecimalType());
+            query.addScalar("chanel", new LongType());
 
             query.setResultTransformer(Transformers.aliasToBean(CampaignCompleteCodeDTO.class));
 

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

+package com.viettel.campaign.repository.impl;
+
+import com.viettel.campaign.model.CampaignCompleteCode;
+import com.viettel.campaign.repository.CampaignCompleteCodeRepositoryCustom;
+import com.viettel.campaign.web.dto.ResultDTO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import java.util.List;
+
+@Repository
+public class CampaignCompleteCompleteCodeRepositoryIpml implements CampaignCompleteCodeRepositoryCustom {
+    @Autowired
+    EntityManager entityManager;
+
+    private Logger log = LoggerFactory.getLogger(CampaignCompleteCompleteCodeRepositoryIpml.class);
+
+
+    @Override
+    @Transactional
+    public ResultDTO updateStatusById(Long id) {
+        ResultDTO dto = new ResultDTO();
+        try {
+            CampaignCompleteCode e = entityManager.find(CampaignCompleteCode.class, id);
+            e.setStatus(new Short("0")); // set status = 0 --> khong hoat dong
+            entityManager.merge(e);
+            dto.setErrorCode("00");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            dto.setErrorCode("01");
+            dto.setDescription(e.getMessage());
+        }
+        return dto;
+    }
+}

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

@@ -21,7 +21,6 @@ import org.springframework.stereotype.Repository;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
-import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -274,7 +273,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 query.setParameter("p_cusNumTo", requestDto.getNumOfCusTo() == 0 ? null : requestDto.getNumOfCusTo());
             }
 
-            query.addScalar("campaignId", new BigDecimalType());
+            query.addScalar("campaignId", new LongType());
             query.addScalar("campaignCode", new StringType());
             query.addScalar("campaignName", new StringType());
             query.addScalar("campaignType", new StringType());
@@ -282,7 +281,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             query.addScalar("chanel", new ShortType());
             query.addScalar("startTime", new DateType());
             query.addScalar("endTime", new DateType());
-            query.addScalar("customerNumber", new BigDecimalType());
+            query.addScalar("customerNumber", new LongType());
             query.addScalar("status", new ShortType());
             query.addScalar("numOfJoinedCus", new LongType());
             query.addScalar("numOfNotJoinedCus", new LongType());
@@ -352,7 +351,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                                 .replaceAll("_", "\\\\_")
                         + "%");
             }
-            query.addScalar("campaignId", new BigDecimalType());
+            query.addScalar("campaignId", new LongType());
             query.addScalar("campaignCode", new StringType());
             query.addScalar("campaignName", new StringType());
             query.addScalar("startTime", new DateType());

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

@@ -41,7 +41,7 @@ public class TicketRepositoryImpl implements TicketRepositoryCustom {
 
             for (Object[] obj : data) {
                 TicketDTO item = new TicketDTO();
-                item.setTicketId(((BigDecimal) obj[0]).longValueExact());
+                item.setTicketId(((Long)obj[0]));
                 item.setCreateDate((Date) obj[1]);
                 item.setSubject((String) obj[2]);
                 item.setStatusName((String) obj[3]);

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

 package com.viettel.campaign.service;
 
-import com.viettel.campaign.web.dto.CampaignCustomerDTO;
+import com.viettel.campaign.web.dto.CampaignDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 
@@ -8,7 +8,12 @@ import java.util.Map;
 
 public interface CampaignService {
     ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto);
+
     ResultDTO search(CampaignRequestDTO requestDto);
+
     ResultDTO findByCampaignCode(CampaignRequestDTO requestDTO);
+
+    ResultDTO addNewCampaign(CampaignDTO campaignDTO);
+
     Map countRecallCustomer(Long companySiteId, Long agentId);
 }

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

@@ -3,6 +3,8 @@ package com.viettel.campaign.service;
 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.request_dto.CampaignCustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.DeleteCustomerRequestDTO;
 
 import java.util.Date;
 import java.util.List;
@@ -18,9 +20,9 @@ public interface CustomerService {
 
     ResultDTO createCustomer(CustomerDTO customerDTO);
 
-    ResultDTO deleteCustomer(CustomerDTO customerDTO);
+    ResultDTO deleteCustomer(DeleteCustomerRequestDTO deleteCustomerRequestDTO);
 
-    ResultDTO deleteIds(List<Long> ids);
+    ResultDTO deleteIds(DeleteCustomerRequestDTO deleteCustomerRequestDTO);
 
     // ------------ customer list ------------ //
 
@@ -34,9 +36,9 @@ public interface CustomerService {
 
     ResultDTO deleteCustomerListIds(List<Long> ids);
 
-    ResultDTO searchCustomerList(String customerListCode, String customerListName, Date dateFrom, Date dateTo, int page, int pageSize, String sort);
+    ResultDTO searchCustomerList(CampaignCustomerRequestDTO campaignCustomerRequestDTO);
 
-    // ------------ customer list ------------ //
+    // ------------ customer contact ------------ //
 
     ResultDTO getCustomerContact(Long customerId, Short contactType, String contact);
 }

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

-package com.viettel.campaign.service;
+package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.service.CampaignCompleteCodeService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;

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

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.model.Campaign;
+import com.viettel.campaign.model.TimeZoneDialMode;
 import com.viettel.campaign.repository.CampaignRepository;
+import com.viettel.campaign.repository.TimeZoneDialModeRepository;
+import com.viettel.campaign.repository.impl.CampaignRepositoryImpl;
 import com.viettel.campaign.service.CampaignService;
 import com.viettel.campaign.utils.Constants;
+import com.viettel.campaign.web.dto.CampaignDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.Map;
 
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class CampaignServiceImpl implements CampaignService {
+    private static final Logger logger = LogManager.getLogger(CampaignRepositoryImpl.class);
 
     @Autowired
     CampaignRepository campaignRepository;
 
+    @Autowired
+    TimeZoneDialModeRepository timeZoneDialModeRepository;
+
+    @Autowired
+    ModelMapper modelMapper;
+
     @Override
     public ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto) {
         return campaignRepository.searchCampaignExecute(requestDto);
@@ -33,6 +51,34 @@ public class CampaignServiceImpl implements CampaignService {
     }
 
     @Override
+    public ResultDTO addNewCampaign(CampaignDTO campaignDTO) {
+        ResultDTO resultDTO = new ResultDTO();
+        Campaign campaign = modelMapper.map(campaignDTO, Campaign.class);
+        TimeZoneDialMode timeZoneDialMode = new TimeZoneDialMode();
+        try {
+            campaign = campaignRepository.save(campaign);
+            //insert sub tables
+            if(campaignDTO.getCurrentTimeMode().equals(1)){
+                timeZoneDialMode.setCompanySiteId(campaignDTO.getCompanySiteId());
+                timeZoneDialMode.setCampaignId(campaign.getCampaignId());
+//                timeZoneDialMode.setHour(campaignDTO.getT);
+
+                timeZoneDialModeRepository.save(timeZoneDialMode);
+            }
+            if(campaignDTO.getCurrentTimeMode().equals(2)) {
+
+            }
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setErrorCode(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setData(campaign);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setErrorCode(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
+
     public Map countRecallCustomer(Long companySiteId, Long agentId) {
         Map result = new HashMap();
         Long count = campaignRepository.countRecallCustomer(companySiteId, agentId);

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

@@ -14,10 +14,16 @@ import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.CustomerMapper;
 import com.viettel.campaign.model.Customer;
 import com.viettel.campaign.utils.DataUtil;
+import com.viettel.campaign.web.dto.request_dto.CampaignCustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.DeleteCustomerRequestDTO;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.transform.Transformers;
+import org.hibernate.type.DateType;
+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.data.domain.*;
 import org.springframework.stereotype.Service;
@@ -130,12 +136,13 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
-    public ResultDTO deleteCustomer(CustomerDTO customerDTO) {
+    public ResultDTO deleteCustomer(DeleteCustomerRequestDTO deleteCustomerRequestDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {
-            if (customerDTO != null) {
+            if (deleteCustomerRequestDTO != null) {
                 // delete
-                customerRepository.deleteById(customerDTO.getCustomerId());
+//                customerRepository.deleteById(customerDTO.getCustomerId());
+                customerListMappingRepository.deleteMappingByCustomerId(deleteCustomerRequestDTO.getCustomerId(), deleteCustomerRequestDTO.getCustomerListId());
 
                 resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                 resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -152,11 +159,12 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Transactional
     @Override
-    public ResultDTO deleteIds(List<Long> ids) {
+    public ResultDTO deleteIds(DeleteCustomerRequestDTO deleteCustomerRequestDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {
-            if (ids != null) {
-                customerRepository.deleteIds(ids);
+            if (deleteCustomerRequestDTO != null) {
+//                customerRepository.deleteIds(ids);
+                customerListMappingRepository.deleteMappingByCustomerIds(deleteCustomerRequestDTO.getCustomerIds(), deleteCustomerRequestDTO.getCustomerListId());
                 resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                 resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
             } else {
@@ -239,7 +247,7 @@ public class CustomerServiceImpl implements CustomerService {
             if (customerListDTO != null) {
                 // update
                 customerList = customerListMapper.toPersistenceBean(customerListDTO);
-                customerList = customerListRepository.save(customerList);
+                customerListRepository.save(customerList);
 
                 resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                 resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -258,14 +266,12 @@ public class CustomerServiceImpl implements CustomerService {
     @Override
     public ResultDTO deleteCustomerList(CustomerListDTO customerListDTO) {
         ResultDTO resultDTO = new ResultDTO();
-        CustomerListMapper customerListMapper = new CustomerListMapper();
-        CustomerList customerList = customerListRepository.findCustomerListByCustomerListId(customerListDTO.getCustomerListId());
 
         try {
             // delete
             if (DataUtil.isNullOrZero(campaignCustomerListRepository.campaignCount(customerListDTO.getCustomerListId()))) {
-                customerList = customerListMapper.toPersistenceBean(customerListDTO);
-                customerList = customerListRepository.save(customerList);
+
+                customerListRepository.deleteCustomerList(customerListDTO.getCustomerListId());
 
                 customerListMappingRepository.deleteMappingByCustomerListId(customerListDTO.getCustomerListId());
 
@@ -291,6 +297,9 @@ public class CustomerServiceImpl implements CustomerService {
             if (ids != null) {
                 if (DataUtil.isNullOrZero(campaignCustomerListRepository.campaignIdsCount(ids))) {
                     customerListRepository.deleteCustomerListIds(ids);
+
+                    customerListMappingRepository.deleteMappingByCustomerListIds(ids);
+
                     resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                     resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
                 } else {
@@ -308,70 +317,87 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
-    public ResultDTO searchCustomerList(String customerListCode, String customerListName, Date dateFrom, Date dateTo, int page, int pageSize, String sort) {
+    public ResultDTO searchCustomerList(CampaignCustomerRequestDTO campaignCustomerRequestDTO) {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
         Session session = sessionFactory.openSession();
         session.beginTransaction();
 
-        StringBuilder sqlStrBuilder = new StringBuilder();
-        sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "search-campaign-customer-by-params"));
-        if (!customerListCode.equals("undefined")) {
-            sqlStrBuilder.append(" AND CUSTOMER_LIST_CODE LIKE :p_list_code");
-        }
-        if (!customerListName.equals("undefined")) {
-            sqlStrBuilder.append(" AND CUSTOMER_LIST_NAME LIKE :p_list_name");
+        if (DataUtil.isNullOrEmpty(campaignCustomerRequestDTO.getCompanySiteId())) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            return resultDTO;
         }
 
-        SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+        try {
+            StringBuilder sqlStrBuilder = new StringBuilder();
+            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "search-campaign-customer-by-params"));
+            if (DataUtil.isNullOrEmpty(campaignCustomerRequestDTO.getCustomerListCode())) {
+                sqlStrBuilder.append(" AND CUSTOMER_LIST_CODE LIKE :p_list_code");
+            }
+            if (DataUtil.isNullOrEmpty(campaignCustomerRequestDTO.getCustomerListName())) {
+                sqlStrBuilder.append(" AND CUSTOMER_LIST_NAME LIKE :p_list_name");
+            }
 
-        query.setParameter("p_date_from", dateFrom);
-        query.setParameter("p_date_to", dateTo);
+            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
 
-        if (!customerListCode.equals("undefined")) {
-            query.setParameter("p_list_code", "%" +
-                    customerListCode
-                            .replace("\\", "\\\\")
-                            .replaceAll("%", "\\\\%")
-                            .replaceAll("_", "\\\\_")
-                    + "%");
-        }
+            query.setParameter("p_date_from", campaignCustomerRequestDTO.getConvertedDateFrom());
+            query.setParameter("p_date_to", campaignCustomerRequestDTO.getConvertedDateTo());
 
-        if (!customerListName.equals("undefined")) {
-            query.setParameter("p_list_name", "%" +
-                    customerListName
-                            .replace("\\", "\\\\")
-                            .replaceAll("%", "\\\\%")
-                            .replaceAll("_", "\\\\_")
-                    + "%");
-        }
+            if (!campaignCustomerRequestDTO.getCustomerListCode().equals("undefined")) {
+                query.setParameter("p_list_code", "%" +
+                        campaignCustomerRequestDTO.getCustomerListCode()
+                                .replace("\\", "\\\\")
+                                .replaceAll("%", "\\\\%")
+                                .replaceAll("_", "\\\\_")
+                        + "%");
+            }
 
-//        Pageable pageable = PageRequest.of(page, pageSize, Sort.by(sort));
-//        Page<CustomerList> pc = customerListRepository.search();
-//
-//        result.put("totalItem", pc.getTotalElements());
-//        result.put("searchList", pc.iterator());
-        query.setResultTransformer(Transformers.aliasToBean(CustomerListDTO.class));
-        int count = 0;
-        List<CustomerListDTO> dtoList = query.list();
-        if (dtoList.size() > 0) {
-            count = query.list().size();
-        }
-//        Pageable pageable = buildPageable();
-//        if (pageable != null) {
-//            query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
-//            query.setMaxResults(pageable.getPageSize());
-//        }
+            if (!campaignCustomerRequestDTO.getCustomerListName().equals("undefined")) {
+                query.setParameter("p_list_name", "%" +
+                        campaignCustomerRequestDTO.getCustomerListName()
+                                .replace("\\", "\\\\")
+                                .replaceAll("%", "\\\\%")
+                                .replaceAll("_", "\\\\_")
+                        + "%");
+            }
 
-        Pageable pageable = PageRequest.of(page, pageSize, Sort.by(sort));
+            query.addScalar("customerListId", new LongType());
+            query.addScalar("companySiteId", new LongType());
+            query.addScalar("customerListCode", new StringType());
+            query.addScalar("customerListName", new StringType());
+            query.addScalar("status", new ShortType());
+            query.addScalar("createBy", new StringType());
+            query.addScalar("createAt", new DateType());
+            query.addScalar("updateBy", new StringType());
+            query.addScalar("updateAt", new DateType());
+            query.addScalar("source", new StringType());
+            query.addScalar("deptCreate", new StringType());
+
+            query.setResultTransformer(Transformers.aliasToBean(CustomerListDTO.class));
+            int count = 0;
+            List<CustomerListDTO> dtoList = query.list();
+            if (dtoList.size() > 0) {
+                count = query.list().size();
+            }
+            Pageable pageable = SQLBuilder.buildPageable(campaignCustomerRequestDTO);
+            if (pageable != null) {
+                query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
+                query.setMaxResults(pageable.getPageSize());
+            }
 
-        List<CustomerListDTO> data = query.list();
-        Page<CustomerListDTO> dataPage = new PageImpl<>(data, pageable, count);
-        resultDTO.setData(dataPage);
-        resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-        resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
-        session.close();
+            List<CustomerListDTO> data = query.list();
+            Page<CustomerListDTO> dataPage = new PageImpl<>(data, pageable, count);
+            resultDTO.setData(dataPage);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        } finally {
+            session.close();
+        }
 
         return resultDTO;
     }

src/main/java/com/viettel/campaign/utils/SQLBuilder.java

@@ -17,7 +17,6 @@ import org.springframework.data.domain.Sort;
 public class SQLBuilder {
     public static final String SQL_MODULE_CAMPAIGN_MNG = "campaign-mng";
     public static final String SQL_MODULE_CAMPAIGN_STATUS_MNG = "campaign-status-mng";
-    public static final String SQL_MODULE_CAMPAIGN_CUSTOMER = "campaign-customer";
 
     public static String getSqlQueryById(String module,
                                          String queryId) {

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

@@ -3,7 +3,6 @@ package com.viettel.campaign.web.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 @Getter
@@ -27,5 +26,5 @@ public class CampaignCompleteCodeDTO extends BaseDTO {
     private Long companySiteId;
     private Short isLock;
     private Long durationLock;
-    private BigDecimal chanel;
+    private Long chanel;
 }

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

@@ -3,20 +3,19 @@ package com.viettel.campaign.web.dto;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 @Getter
 @Setter
 public class CampaignDTO extends BaseDTO {
 
-    private BigDecimal campaignId;
-    private BigDecimal companySiteId;
+    private Long campaignId;
+    private Long companySiteId;
     private String campaignCode;
     private String campaignName;
     private Short chanel;
     private String content;
-    private BigDecimal customerNumber;
+    private Long customerNumber;
     private String target;
     private Short status;
     private Date startTime;
@@ -31,29 +30,29 @@ public class CampaignDTO extends BaseDTO {
     private String campaignType;
     private String product;
     private Integer processStatus;
-    private BigDecimal dialMode;
+    private Long dialMode;
     private String deptCode;
     private String timeRange;
     private String dayOfWeek;
-    private BigDecimal currentTimeModel;
-    private BigDecimal wrapupTimeConnect;
-    private BigDecimal wrapupTimeDisconnect;
-    private BigDecimal previewTime;
-    private BigDecimal rateDial;
-    private BigDecimal rateMiss;
-    private BigDecimal avgTimeProcess;
-    private BigDecimal isApplyCustLock;
-    private BigDecimal targetType;
-    private BigDecimal isTarget;
-    private BigDecimal campaignIvrCalledId;
-    private BigDecimal concurrentCall;
+    private Long currentTimeMode;
+    private Long wrapupTimeConnect;
+    private Long wrapupTimeDisconnect;
+    private Long previewTime;
+    private Long rateDial;
+    private Long rateMiss;
+    private Long avgTimeProcess;
+    private Long isApplyCustLock;
+    private Long targetType;
+    private Long isTarget;
+    private Long campaignIvrCalledId;
+    private Long concurrentCall;
     private String callOutTimeInDay;
     private String musicList;
     private Integer timePlayMusic;
     private Date campaignStart;
     private Date campaignEnd;
     private Integer timeWaitAgent;
-    private BigDecimal questIndex;
+    private Long questIndex;
     private Long numOfJoinedCus;
     private Long numOfNotJoinedCus;
     private Long numOfLockCus;

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

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Getter
+@Setter
+public class TimeRangeDialModeDTO {
+    private Long timeRangeDialModeId;
+    private Long companySiteId;
+    private Date startTime;
+    private Long campaignId;
+    private Short dialMode;
+    private Long userId;
+}

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

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Getter
+@Setter
+public class TimeZoneDialModeDTO {
+    private Long timeRangeDialModeId;
+    private Long companySiteId;
+    private String hour;
+    private String minute;
+    private Long campaignId;
+    private Short dialMode;
+    private Long userId;
+}

src/main/java/com/viettel/campaign/web/dto/request_dto/CampaignCustomerRequestDTO.java

+package com.viettel.campaign.web.dto.request_dto;
+
+import com.viettel.campaign.web.dto.BaseDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CampaignCustomerRequestDTO extends BaseDTO {
+    String customerListCode;
+    String customerListName;
+    String convertedDateFrom;
+    String convertedDateTo;
+    String companySiteId;
+}

src/main/java/com/viettel/campaign/web/dto/request_dto/DeleteCustomerRequestDTO.java

+package com.viettel.campaign.web.dto.request_dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class DeleteCustomerRequestDTO {
+    Long customerId;
+    Long customerListId;
+    List<Long> customerIds;
+}

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

@@ -84,8 +84,8 @@ public class CampaignCompleteCodeController {
         ResultDTO resultDTO = completeCodeService.deleteList(completeCodeDtos);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
-
-    @PostMapping("/deleteById/{id}")
+    @CrossOrigin(origins = "*")
+    @PostMapping("/deleteById")
     @ResponseBody
     public  ResultDTO deleteById(@RequestParam("id") Long id){
         ResultDTO resultDTO = new ResultDTO();

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

@@ -39,6 +39,11 @@ public class CampaignController {
         return campaignService.findByCampaignCode(dto);
     }
 
+    @RequestMapping(method = RequestMethod.POST)
+    public ResultDTO addNewCampaign(@RequestBody CampaignRequestDTO dto) {
+        return campaignService.findByCampaignCode(dto);
+    }
+
     @GetMapping("/countRecallCustomer")
     @ResponseBody
     public ResponseEntity countRecallCustomer(@RequestParam("companySiteId") Long companySiteId, @RequestParam("agentId") Long agentId) {

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

@@ -4,6 +4,8 @@ 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.service.CustomerService;
+import com.viettel.campaign.web.dto.request_dto.CampaignCustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.DeleteCustomerRequestDTO;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -12,7 +14,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -68,17 +69,17 @@ public class CustomerController {
 
     @PostMapping("/delete")
     @ResponseBody
-    public ResultDTO deleteCustomer(@RequestBody @Valid CustomerDTO customerDTO) {
+    public ResultDTO deleteCustomer(@RequestBody @Valid DeleteCustomerRequestDTO deleteCustomerRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = customerService.deleteCustomer(customerDTO);
+        result = customerService.deleteCustomer(deleteCustomerRequestDTO);
         return result;
     }
 
     @PostMapping("/deleteIds")
     @ResponseBody
-    public ResultDTO deleteIds(@RequestBody @Valid List<Long> ids) {
+    public ResultDTO deleteIds(@RequestBody @Valid DeleteCustomerRequestDTO deleteCustomerRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = customerService.deleteIds(ids);
+        result = customerService.deleteIds(deleteCustomerRequestDTO);
         return result;
     }
 
@@ -147,10 +148,9 @@ public class CustomerController {
         return result;
     }
 
-    @GetMapping("/searchCustomerList")
-    @ResponseBody
-    public ResponseEntity searchCustomerList(@RequestParam("customerListCode") String customerListCode, @RequestParam("customerListName") String customerListName, @RequestParam("dateFrom") Date dateFrom, @RequestParam("dateTo") Date dateTo, @RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
-        ResultDTO result = customerService.searchCustomerList(customerListCode, customerListName, dateFrom, dateTo, page, pageSize, sort);
+    @RequestMapping(value = "/searchCustomerList", method = RequestMethod.POST)
+    public ResponseEntity searchCustomerList(@RequestBody CampaignCustomerRequestDTO campaignCustomerRequestDTO) {
+        ResultDTO result = customerService.searchCustomerList(campaignCustomerRequestDTO);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 

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

 SELECT
-    CUSTOMER_LIST_ID,
-    COMPANY_SITE_ID,
-    CUSTOMER_LIST_CODE,
-    CUSTOMER_LIST_NAME,
-    STATUS,
-    CREATE_BY,
-    CREATE_AT,
-    UPDATE_BY,
-    UPDATE_AT,
-    SOURCE,
-    DEPT_CREATE
+    CUSTOMER_LIST_ID customerListId,
+    COMPANY_SITE_ID companySiteId,
+    CUSTOMER_LIST_CODE customerListCode,
+    CUSTOMER_LIST_NAME customerListName,
+    STATUS status,
+    CREATE_BY createBy,
+    CREATE_AT createAt,
+    UPDATE_BY updateBy,
+    UPDATE_AT updateAt,
+    SOURCE source,
+    DEPT_CREATE deptCreate
 FROM CUSTOMER_LIST
 WHERE 1 = 1
 AND CREATE_AT BETWEEN :p_date_from AND :p_date_to

src/main/resources/sql/campaign-status-mng/search-campaign-status-by-params.sql

@@ -11,6 +11,7 @@ SELECT
 
 FROM CAMPAIGN_COMPLETE_CODE a
 LEFT JOIN CAMPAIGN b ON a.CAMPAIGN_ID = b.CAMPAIGN_ID
-LEFT JOIN AP_PARAM c ON a.CAMPAIGN_TYPE = to_char(c.AP_PARAM_ID)
+LEFT JOIN AP_PARAM c ON a.CAMPAIGN_TYPE = to_char(c.AP_PARAM_ID);
+SELECT max(COMPLETE_VALUE) ,COMPANY_SITE_ID from CAMPAIGN_COMPLETE_CODE where COMPANY_SITE_ID = : p_site_id GROUP BY COMPANY_SITE_ID