Merge branch 'master' into tubn

etc/log.conf

+log4j.rootLogger=INFO, R, A1
+
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+# Print the date in ISO 8601 format
+log4j.appender.A1.layout.ConversionPattern=[%t] %d{dd/MM/yyyy HH:mm:ss} %5p %c{1}: (%L) : %m%n
+
+log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.R.DatePattern='.'yyyy-MM-dd
+log4j.appender.R.File=log/campaign.log
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=[%t] %d{dd/MM/yyyy HH:mm:ss} %5p %c{1}: (%L) : %m%n
\ No newline at end of file

log/campaign.log

+[main] 19/08/2019 17:50:53  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016
+[main] 19/08/2019 17:53:34  INFO RedisUtil: (38) : Start connect Redis: 10.60.156.82:8011,10.60.156.82:8012,10.60.156.82:8013,10.60.156.82:8014,10.60.156.82:8015,10.60.156.82:8016

pom.xml

@@ -49,8 +49,8 @@
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc7</artifactId>
-<!--            <scope>system</scope>-->
-<!--            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>-->
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>
             <version>1.0</version>
         </dependency>
         <dependency>
@@ -121,17 +121,18 @@
             <artifactId>poi</artifactId>
             <version>3.17</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
             <version>3.17</version>
         </dependency>
-        <dependency>
-            <groupId>com.cronutils</groupId>
-            <artifactId>cron-utils</artifactId>
-            <version>9.0.1</version>
-        </dependency>
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
@@ -153,45 +154,8 @@
 
     </dependencies>
 
-    <!--<dependencyManagement>-->
-    <!--<dependencies>-->
-    <!--<dependency>-->
-    <!--<groupId>org.springframework.cloud</groupId>-->
-    <!--<artifactId>spring-cloud-dependencies</artifactId>-->
-    <!--<version>${spring-cloud.version}</version>-->
-    <!--<type>pom</type>-->
-    <!--<scope>import</scope>-->
-    <!--</dependency>-->
-    <!--</dependencies>-->
-    <!--</dependencyManagement>-->
-
     <build>
         <plugins>
-            <!--<plugin>-->
-            <!--<groupId>org.asciidoctor</groupId>-->
-            <!--<artifactId>asciidoctor-maven-plugin</artifactId>-->
-            <!--<version>1.5.3</version>-->
-            <!--<executions>-->
-            <!--<execution>-->
-            <!--<id>generate-docs</id>-->
-            <!--<phase>prepare-package</phase>-->
-            <!--<goals>-->
-            <!--<goal>process-asciidoc</goal>-->
-            <!--</goals>-->
-            <!--<configuration>-->
-            <!--<backend>html</backend>-->
-            <!--<doctype>book</doctype>-->
-            <!--</configuration>-->
-            <!--</execution>-->
-            <!--</executions>-->
-            <!--<dependencies>-->
-            <!--<dependency>-->
-            <!--<groupId>org.springframework.restdocs</groupId>-->
-            <!--<artifactId>spring-restdocs-asciidoctor</artifactId>-->
-            <!--<version>${spring-restdocs.version}</version>-->
-            <!--</dependency>-->
-            <!--</dependencies>-->
-            <!--</plugin>-->
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

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

 package com.viettel.campaign.config;
 
 //import com.viettel.campaign.job.CampaignJob;
+
 import com.viettel.campaign.job.CampaignJob;
-import com.viettel.campaign.service.ApParamService;
 import lombok.extern.slf4j.Slf4j;
-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.Configuration;
 import org.springframework.scheduling.TaskScheduler;
-import org.springframework.scheduling.Trigger;
-import org.springframework.scheduling.TriggerContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.support.CronTrigger;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.concurrent.ScheduledFuture;

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

@@ -25,33 +25,33 @@ public class CorsFilter implements Filter {
 
         HttpServletResponse response = (HttpServletResponse) resp;
         response.setHeader("Access-Control-Allow-Origin", "*");
-        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
         response.setHeader("Access-Control-Max-Age", "3600");
         response.setHeader("Access-Control-Allow-Headers", "Origin, Authorization, X-Requested-With, Content-Type, Accept, token1, X-Auth-Token");
 
         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.");
-//        }
+//        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.");
+        }
     }
 
     @Override

src/main/java/com/viettel/campaign/mapper/CustomerMapper.java

@@ -21,7 +21,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
             obj.setMobileNumber(model.getMobileNumber());
             obj.setName(model.getName());
             obj.setSiteId(model.getSiteId());
-            obj.setStatus(model.getStatus());
+            obj.setStatus(model.getStatus().toString());
 //            String additionalInfo = "";
 //            if (model.getName() != null && !"".equals(model.getName())) {
 //                additionalInfo += model.getName();
@@ -58,7 +58,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
             obj.setCustomerImg(dtoBean.getCustomerImg());
             obj.setCreateDate(dtoBean.getCreateDate());
             obj.setUpdateDate(dtoBean.getUpdateDate());
-            obj.setStatus(dtoBean.getStatus());
+            obj.setStatus(Long.parseLong(dtoBean.getStatus()));
             obj.setCreateBy(dtoBean.getCreateBy());
             obj.setUpdateBy(dtoBean.getUpdateBy());
             obj.setSiteId(dtoBean.getSiteId());
@@ -71,7 +71,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
             obj.setUserName(dtoBean.getUserName());
             obj.setAreaCode(dtoBean.getAreaCode());
             obj.setCustomerType(dtoBean.getCustomerType());
-            obj.setCallAllowed(dtoBean.getCallAllowed());
+            obj.setCallAllowed(Long.parseLong(dtoBean.getCallAllowed()));
             obj.setEmailAllowed(dtoBean.getEmailAllowed());
             obj.setSmsAllowed(dtoBean.getSmsAllowed());
             obj.setIpccStatus(dtoBean.getIpccStatus());

src/main/java/com/viettel/campaign/model/ccms_full/Customer.java

@@ -45,7 +45,7 @@ public class Customer implements Serializable {
     @Temporal(TemporalType.TIMESTAMP)
     private Date updateDate;
     @Column(name = "STATUS")
-    private String status;
+    private Long status;
     @Size(max = 50)
     @Column(name = "CREATE_BY")
     private String createBy;
@@ -80,7 +80,7 @@ public class Customer implements Serializable {
     @Column(name = "CUSTOMER_TYPE")
     private Long customerType;
     @Column(name = "CALL_ALLOWED")
-    private String callAllowed;
+    private Long callAllowed;
     @Column(name = "EMAIL_ALLOWED")
     private Long emailAllowed;
     @Column(name = "SMS_ALLOWED")
@@ -88,4 +88,7 @@ public class Customer implements Serializable {
     @Size(max = 100)
     @Column(name = "IPCC_STATUS")
     private String ipccStatus;
+    @Size(max = 2000)
+    @Column(name = "AVATAR_LINK")
+    private String avatarLink;
 }

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

@@ -43,4 +43,6 @@ public class CustomerContact {
     @Column(name = "END_DATE")
     @Temporal(TemporalType.TIMESTAMP)
     private Date endDate;
+    @Column(name = "SITE_ID")
+    private Long siteId;
 }

src/main/java/com/viettel/campaign/model/ccms_full/CustomerList.java

 package com.viettel.campaign.model.ccms_full;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import javax.persistence.*;
@@ -13,6 +15,8 @@ import java.util.Date;
 @Table(name = "CUSTOMER_LIST")
 @Getter
 @Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class CustomerList implements Serializable {
 
     @Id

src/main/java/com/viettel/campaign/model/ccms_full/CustomerListMapping.java

 package com.viettel.campaign.model.ccms_full;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Entity
 @Table(name = "CUSTOMER_LIST_MAPPING")
 @Getter
 @Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class CustomerListMapping implements Serializable {
 
     @Id
+    @GeneratedValue(generator = "customer_list_mapping_seq")
+    @SequenceGenerator(name = "customer_list_mapping_seq", sequenceName = "customer_list_mapping_seq", allocationSize = 1)
+    @Basic(optional = false)
+    @NotNull
     @Column(name = "CUSTOMER_LIST_MAPPING_ID")
     private Long customerListMappingId;
+    @NotNull
     @Column(name = "CUSTOMER_ID")
     private Long customerId;
     @Column(name = "COMPANY_SITE_ID")
     private Long companySiteId;
+    @NotNull
     @Column(name = "CUSTOMER_LIST_ID")
     private Long customerListId;
 }

src/main/java/com/viettel/campaign/web/dto/CustomizeFieldDTO.java → src/main/java/com/viettel/campaign/model/ccms_full/CustomizeFieldObject.java

-package com.viettel.campaign.web.dto;
+package com.viettel.campaign.model.ccms_full;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
+@Entity
+@Table(name = "CUSTOMIZE_FIELD_OBJECT")
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class CustomizeFieldDTO {
+public class CustomizeFieldObject implements Serializable {
+    @Id
+    @GeneratedValue(generator = "CUSTOMIZE_FIELD_OBJECT_SEQ")
+    @SequenceGenerator(name = "CUSTOMIZE_FIELD_OBJECT_SEQ", sequenceName = "CUSTOMIZE_FIELD_OBJECT_SEQ", allocationSize = 1)
+    @Basic(optional = false)
+    @NotNull
+    @Column(name = "CUSTOMIZE_FIELD_OBJECT_ID")
     private Long customizeFieldObjectId;
+    @Column(name = "OBJECT_ID")
     private Long objectId;
+    @Column(name = "CUSTOMIZE_FIELDS_ID")
     private Long customizeFieldId;
+    @Column(name = "VALUE_TEXT")
     private String valueText;
+    @Column(name = "VALUE_NUMBER")
     private Long valueNumber;
+    @Column(name = "VALUE_DATE")
     private Date valueDate;
+    @Column(name = "VALUE_CHECKBOX")
     private Long valueCheckbox;
-    private Date createBy;
+    @Column(name = "CREATE_BY")
+    private String createBy;
+    @Column(name = "CREATE_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
     private Date createDate;
+    @Column(name = "UPDATE_BY")
     private String updateBy;
+    @Column(name = "UPDATE_DATE")
     private Date updateDate;
+    @Column(name = "STATUS")
     private Long status;
+    @Column(name = "FIELD_OPTION_VALUE_ID")
     private Long fieldOptionValueId;
+    @Column(name = "TITLE")
     private String title;
+    @Column(name = "FUNCTION_CODE")
     private String functionCode;
 }

src/main/java/com/viettel/campaign/model/ccms_full/CustomizeFieldOptionValue.java

+package com.viettel.campaign.model.ccms_full;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "CUSTOMIZE_FIELD_OPTION_VALUE")
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class CustomizeFieldOptionValue implements Serializable {
+    @Id
+    @Column(name = "FIELD_OPTION_VALUE_ID")
+    @Basic(optional = false)
+    @NotNull
+    private Long fieldOptionValueId;
+
+    @Column(name = "FIELD_OPTION_ID")
+    private Long fieldOptionId;
+
+    @Column(name = "NAME")
+    private String name;
+
+    @Column(name = "VALUE")
+    private String value;
+
+    @Column(name = "POSITION")
+    private Long position;
+
+    @Column(name = "CREATE_BY")
+    private String createBy;
+
+    @Column(name = "CREATE_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date createDate;
+
+    @Column(name = "UPDATE_BY")
+    private String updateBy;
+
+    @Column(name = "UPDATE_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date updateDate;
+
+    @Column(name = "STATUS")
+    private Long status;
+}

src/main/java/com/viettel/campaign/web/dto/DynamicExcelHeaderDTO.java → src/main/java/com/viettel/campaign/model/ccms_full/CustomizeFields.java

-package com.viettel.campaign.web.dto;
+package com.viettel.campaign.model.ccms_full;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
+@Entity
+@Table(name = "CUSTOMIZE_FIELDS")
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class DynamicExcelHeaderDTO {
+public class CustomizeFields implements Serializable {
+    @Id
+    @GeneratedValue(generator = "CUSTOMIZE_FIELDS_SEQ")
+    @SequenceGenerator(name = "CUSTOMIZE_FIELDS_SEQ", sequenceName = "CUSTOMIZE_FIELDS_SEQ", allocationSize = 1)
+    @Basic(optional = false)
+    @NotNull
+    @Column(name = "CUSTOMIZE_FIELD_ID")
     private Long customizeFieldId;
+    @Column(name = "SITE_ID")
     private Long siteId;
+    @Column(name = "FUNCTION_CODE")
     private String functionCode;
+    @Column(name = "CREATE_BY")
     private String createBy;
+    @Column(name = "CREATE_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
     private Date createDate;
+    @Column(name = "UPDATE_BY")
     private String updateBy;
+    @Column(name = "UPDATE_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
     private Date updateDate;
+    @Column(name = "STATUS")
     private Long status;
+    @Column(name = "TYPE")
     private String type;
+    @Column(name = "TITLE")
     private String title;
+    @Column(name = "PLACEHOLDER")
     private String placeholder;
+    @Column(name = "DESCRIPTION")
     private String description;
+    @Column(name = "POSITION")
     private Long position;
+    @Column(name = "REQUIRED")
     private Long required;
+    @Column(name = "FIELD_OPTIONS_ID")
     private Long fieldOptionsId;
+    @Column(name = "REGEXP_FOR_VALIDATION")
     private String regexpForValidation;
+    @Column(name = "MAX_LENGTH")
     private Long maxLength;
+    @Column(name = "MIN_LENGTH")
     private Long minLength;
+    @Column(name = "MIN")
     private Long min;
+    @Column(name = "MAX")
     private Long max;
+    @Column(name = "ACTIVE")
     private Long active;
+
+    public CustomizeFields(String type, String title) {
+        this.type = type;
+        this.title = title;
+    }
 }

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

 package com.viettel.campaign.repository.ccms_full;
 
-import com.viettel.campaign.web.dto.ApParamDTO;
-import com.viettel.campaign.web.dto.CampaignDTO;
-import com.viettel.campaign.web.dto.ContactCustResultDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
@@ -23,7 +20,7 @@ public interface CampaignExecuteRepository {
 
     ResultDTO getInteractiveResult(CampaignRequestDTO dto);
 
-    List<ContactCustResultDTO> getExcelInteractiveResult(CampaignRequestDTO dto);
+    List<ContactCusResDTO> getExcelInteractiveResult(CampaignRequestDTO dto);
 
     List<ContactCustResultDTO> getContactCustById(CampaignRequestDTO dto);
     //</editor-fold: hungtt>

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

@@ -26,4 +26,6 @@ public interface CampaignRepositoryCustom {
     ResultDTO getListFieldsNotShow(CampaignRequestDTO dto);
     //hungtt
     ResultDTO getListFieldsToShow(CampaignRequestDTO dto);
+    //hungtt
+    ResultDTO getCampaignCustomerList(CampaignRequestDTO dto);
 }

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

@@ -11,4 +11,6 @@ import java.util.List;
 public interface CustomerContactRepository extends JpaRepository<CustomerContact, Long> {
     @Query("FROM CustomerContact WHERE status = 1 AND customerId = :customerId AND contactType = :contactType AND (contact IS NULL OR UPPER(contact) LIKE UPPER(concat('%', :contact, '%')))")
     List<CustomerContact> findByCustomerIdAndAndContactTypeAndContact(@Param("customerId") Long customerId, @Param("contactType") Short contactType, @Param("contact") String contact, Pageable pageable);
+
+    CustomerContact findCustomerContactByContactTypeAndContactAndIsDirectLine(Short contactType, String contact, Short isDirectLine);
 }

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+@Repository
+public interface CustomizeFieldObjectRepository extends JpaRepository<CustomizeFieldObject, Long> {
+    List<CustomizeFieldObject> findCustomizeFieldObjectsByFunctionCodeEqualsAndObjectId(String str, Long id);
+}

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.model.ccms_full.CustomizeFieldOptionValue;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CustomizeFieldOptionValueRepository extends JpaRepository<CustomizeFieldOptionValue, Long> {
+    List<CustomizeFieldOptionValue> findCustomizeFieldOptionValuesByFieldOptionIdAndStatus(Long id, Long status);
+
+    CustomizeFieldOptionValue findCustomizeFieldOptionValueByNameEqualsAndStatus(String name, Long status);
+}

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.model.ccms_full.CustomizeFields;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CustomizeFieldsRepository extends JpaRepository<CustomizeFields, Long> {
+    List<CustomizeFields> findCustomizeFieldsByFunctionCodeEqualsAndStatusAndActiveAndSiteId(String functionCode, Long status, Long active, Long siteId);
+}

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

 package com.viettel.campaign.repository.ccms_full;
 
+import com.viettel.campaign.web.dto.ScenarioQuestionDTO;
+
 /**
  * @author anhvd_itsol
  */

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

 package com.viettel.campaign.repository.ccms_full;
 
+import com.viettel.campaign.web.dto.ScenarioQuestionDTO;
+
 /**
  * @author anhvd_itsol
  */
 
 
 public interface ScenarioQuestionRepositoryCustom {
+    Integer countDuplicateQuestionCode(ScenarioQuestionDTO questionDTO);
 }

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

@@ -20,4 +20,6 @@ public interface TimeRangeDialModeRepository extends JpaRepository<TimeRangeDial
     @Query(value = "SELECT * FROM TIME_RANGE_DIAL_MODE r " +
             "WHERE r.CAMPAIGN_ID = :campaignId AND r.COMPANY_SITE_ID = :companySiteId AND TO_CHAR(r.START_TIME,'HH24:MI:SS') <= TO_CHAR(SYSDATE,'HH24:MI:SS')", nativeQuery = true)
     TimeRangeDialMode findDialModeAtCurrent(@Param("campaignId") Long campaignId, @Param("companySiteId") Long companySiteId);
+
+    void deleteAllByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
 }

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

@@ -20,4 +20,6 @@ public interface TimeZoneDialModeRepository extends JpaRepository<TimeZoneDialMo
     @Query(value = "SELECT * FROM TIME_ZONE_DIAL_MODE z " +
             "WHERE z.CAMPAIGN_ID = :campaignId AND z.COMPANY_SITE_ID = :companySiteId AND concat(z.HOUR, ':', z.MINUTE) <= TO_CHAR(SYSDATE,'HH24:MI')", nativeQuery = true)
     TimeZoneDialMode findDialModeAtCurrent(@Param("campaignId") Long campaignId, @Param("companySiteId") Long companySiteId);
+
+    void deleteAllByCampaignIdAndCompanySiteId(Long campaignId, Long companySiteId);
 }

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

@@ -8,10 +8,7 @@ import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.utils.HibernateUtil;
 import com.viettel.campaign.utils.SQLBuilder;
-import com.viettel.campaign.web.dto.CampaignDTO;
-import com.viettel.campaign.web.dto.CustomerCustomDTO;
-import com.viettel.campaign.web.dto.FieldsToShowDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -519,7 +516,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             stringBuilder.append("     where table_name = 'CUSTOMER'");
             stringBuilder.append(" )");
             stringBuilder.append(" select * from column_name_temp");
-            stringBuilder.append(" where columnName not in (select column_name from campaign_customerlist_column)");
+            stringBuilder.append(" where columnName not in (select column_name from campaign_customerlist_column where column_name is not null)");
             stringBuilder.append(" union all");
             stringBuilder.append(" select title columnName, 0 isFix ");
             stringBuilder.append(" from customize_fields, dual");
@@ -553,7 +550,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 //            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-list-fields-to-show");
             sqlBuilder.append(" select to_char(column_name) columnName, 1 isFix");
             sqlBuilder.append(" from campaign_customerlist_column, dual");
-            sqlBuilder.append(" where campaign_id = :p_campaign_id");
+            sqlBuilder.append(" where campaign_id = :p_campaign_id and column_name is not null");
             sqlBuilder.append(" union all");
             sqlBuilder.append(" select customize_field_title columnName, 0 isFix");
             sqlBuilder.append(" from campaign_customerlist_column");
@@ -571,4 +568,27 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         return resultDTO;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO getCampaignCustomerList(CampaignRequestDTO dto) {
+        List<CustomerListDTO> list = new ArrayList();
+        ResultDTO resultDTO = new ResultDTO();
+        Map<String, String> params = new HashMap<>();
+
+//        StringBuilder sb = new StringBuilder();
+        try {
+            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-list-campaign-customer");
+            params.put("p_campaign_id", dto.getCampaignId());
+            list = namedParameterJdbcTemplate.query(sql, params, BeanPropertyRowMapper.newInstance(CustomerListDTO.class));
+            resultDTO.setListData(list);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
+
 }

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

 package com.viettel.campaign.repository.ccms_full.impl;
 
+import com.viettel.campaign.repository.ccms_full.ScenarioAnswerRepositoryCustom;
+import com.viettel.campaign.web.dto.ScenarioQuestionDTO;
+
 /**
  * @author anhvd_itsol
  */
-public class ScenarioAnswerRepositoryImpl {
+public class ScenarioAnswerRepositoryImpl implements ScenarioAnswerRepositoryCustom {
 }

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

 package com.viettel.campaign.repository.ccms_full.impl;
 
 import com.viettel.campaign.repository.ccms_full.ScenarioQuestionRepositoryCustom;
+import com.viettel.campaign.utils.HibernateUtil;
+import com.viettel.campaign.web.dto.ScenarioQuestionDTO;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.hibernate.SQLQuery;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * @author anhvd_itsol
  */
 
 @Repository
 public class ScenarioQuestionRepositoryImpl implements ScenarioQuestionRepositoryCustom {
+    private static final Logger logger = LogManager.getLogger(ScenarioQuestionRepositoryImpl.class);
+
+    @Override
+    public Integer countDuplicateQuestionCode(ScenarioQuestionDTO questionDTO) {
+        logger.info("Start search duplicate quest code row::");
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+        Integer count = null;
+
+        try {
+            StringBuilder sb = new StringBuilder();
+            sb.append("SELECT COUNT(1) FROM SCENARIO_QUESTION WHERE 1 = 1 AND STATUS = 1 ");
+            if (questionDTO.getScenarioQuestionId() != null) {
+                sb.append(" AND SCENARIO_QUESTION_ID <> :p_question_id ");
+            }
+            if (questionDTO.getCode() != null) {
+                sb.append(" AND CODE = :p_code ");
+            }
+            if (questionDTO.getCampaignId() != null) {
+                sb.append(" AND CAMPAIGN_ID = :p_campaign_id");
+            }
+            if (questionDTO.getCompanySiteId() != null) {
+                sb.append(" AND COMPANY_SITE_ID = :p_site_id");
+            }
+            SQLQuery query = session.createSQLQuery(sb.toString());
+            if (questionDTO.getScenarioQuestionId() != null) {
+                query.setParameter("p_question_id", questionDTO.getScenarioQuestionId());
+            }
+            if (questionDTO.getCode() != null) {
+                query.setParameter("p_code", questionDTO.getCode());
+            }
+            if (questionDTO.getCampaignId() != null) {
+                query.setParameter("p_campaign_id", questionDTO.getCampaignId());
+            }
+            if (questionDTO.getCompanySiteId() != null) {
+                query.setParameter("p_site_id", questionDTO.getCompanySiteId());
+            }
+
+            final List<BigDecimal> obj = query.list();
 
+            for (BigDecimal i : obj) {
+                if (i != null) {
+                    count = i.intValue();
+                }
+            }
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+        }
+        return count;
+    }
 }

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

@@ -54,6 +54,8 @@ public interface CampaignService {
     ResultDTO getListFieldsNotShow(CampaignRequestDTO dto);
 
     ResultDTO getListFieldsToShow(CampaignRequestDTO dto);
+
+    ResultDTO getCampaignCustomerList(CampaignRequestDTO dto);
     //</editor-fold>
 
 }

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

@@ -2,15 +2,16 @@ 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.model.ccms_full.CustomizeFieldObject;
+import com.viettel.campaign.model.ccms_full.CustomizeFields;
 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 com.viettel.econtact.filter.UserSession;
 
-import java.io.File;
 import java.util.Date;
 import java.util.List;
-
-import java.util.List;
+import java.util.Map;
 
 public interface CustomerService {
 
@@ -62,9 +63,11 @@ public interface CustomerService {
     List<Customer> findAllByCondition(Long siteId, Date endTime);
     Customer update(Customer c);
 
-    List<DynamicExcelHeaderDTO> getDynamicHeader(Long companySiteId);
+    List<CustomizeFields> getDynamicHeader(Long companySiteId);
+
+    byte[] buildTemplate(Long companySiteId);
 
-    void buildTemplate(Long companySiteId);
+    Map<String, Object> readAndValidateCustomer(String path, List<CustomizeFields> headerDTOS, UserSession userSession, Long customerListId);
 
-    List<CustomizeFieldDTO> getCustomizeField(Long customerId);
+    List<CustomizeFieldObject> getCustomizeField(Long customerId);
 }

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

@@ -14,7 +14,10 @@ public interface ScenarioQuestionService {
 
     Long getMaxOrderId(Long scenarioId, Long campaignId, Long companySiteId);
 
-    Integer countDuplicateQuestionCode(String code, Long scenarioId, Long campaignId, Long companySiteId);
+    Integer countDuplicateQuestionCode(ScenarioQuestionDTO questionDTO);
 
     ResultDTO delete(ScenarioQuestionDTO scenarioQuestionDTO);
+
+    ResultDTO update(ScenarioQuestionDTO scenarioQuestionDTO);
+
 }

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

@@ -110,7 +110,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto) {
         Locale locale = Locale.forLanguageTag("vi");
-        List<ContactCustResultDTO> list = campaignExecuteRepository.getExcelInteractiveResult(dto);
+        List<ContactCusResDTO> list = campaignExecuteRepository.getExcelInteractiveResult(dto);
 
         XSSFWorkbook workbook = new XSSFWorkbook();
         Sheet sheet;
@@ -194,9 +194,9 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
             writeCellContent(row, styleRow, col++, rowIndex);
             writeCellContent(row, styleRow, col++, list.get(i).getCampaignCode());
             writeCellContent(row, styleRow, col++, list.get(i).getCampaignName());
-            writeCellContent(row, styleRow, col++, list.get(i).getAgentId());
+            writeCellContent(row, styleRow, col++, list.get(i).getUserName());
             writeCellContent(row, styleRow, col++, list.get(i).getPhoneNumber());
-            writeCellContent(row, styleRow, col++, list.get(i).getCustomerId());
+            writeCellContent(row, styleRow, col++, list.get(i).getCustomerName());
             writeCellContent(row, styleRow, col++, list.get(i).getCustomerName());
             writeCellContent(row, styleRow, col++, formatter.format(list.get(i).getCreateTime()));
             writeCellContent(row, styleRow, col++, list.get(i).getContactStatus());

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

@@ -404,6 +404,8 @@ public class CampaignServiceImpl implements CampaignService {
             // Save campaign to database
             campaignRepository.save(campaignEntity);
             // Save time dial
+            timeRangeDialModeRepository.deleteAllByCampaignIdAndCompanySiteId(dto.getCampaignId(), dto.getCompanySiteId());
+            timeZoneDialModeRepository.deleteAllByCampaignIdAndCompanySiteId(dto.getCampaignId(), dto.getCompanySiteId());
             for (TimeRangeDialModeDTO timeRangeDto : lstTimeRange) {
                 timeRangeDto.setCampaignId(dto.getCampaignId());
                 TimeRangeDialMode timeRangeEntity = modelMapper.map(timeRangeDto, TimeRangeDialMode.class);
@@ -479,6 +481,12 @@ public class CampaignServiceImpl implements CampaignService {
         return resultDTO;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO getCampaignCustomerList(CampaignRequestDTO dto) {
+        return campaignRepositoryCustom.getCampaignCustomerList(dto);
+    }
+
     // hungtt
     private Map<String, String> setMapData(Map<String, String> mapColumn, Locale locale) {
         mapColumn.put("CUSTOMER_ID", BundleUtils.getLangString("CUSTOMER_ID", locale));
@@ -504,6 +512,9 @@ public class CampaignServiceImpl implements CampaignService {
         mapColumn.put("EMAIL_ALLOWED", BundleUtils.getLangString("EMAIL_ALLOWED", locale));
         mapColumn.put("SMS_ALLOWED", BundleUtils.getLangString("SMS_ALLOWED", locale));
         mapColumn.put("IPCC_STATUS", BundleUtils.getLangString("IPCC_STATUS", locale));
+        mapColumn.put("EMAIL", BundleUtils.getLangString("EMAIL", locale));
+        mapColumn.put("CUSTOMER_TYPE", BundleUtils.getLangString("CUSTOMER_TYPE", locale));
+        mapColumn.put("AVATAR_LINK", BundleUtils.getLangString("AVATAR_LINK", locale));
         return mapColumn;
     }
     private String generateCampaignCode(String campaignType, Short chanel) {

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

@@ -2,10 +2,7 @@ package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.config.DataSourceQualify;
 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.repository.ccms_full.*;
 import com.viettel.campaign.service.ScenarioQuestionService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.web.dto.ResultDTO;
@@ -46,6 +43,9 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
     @Autowired
     ModelMapper modelMapper;
 
+    @Autowired
+    ScenarioQuestionRepositoryCustom questionRepositoryCustom;
+
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO findByScenarioIdAndCampaignIdAndCompanySiteId(Long scenarioId, Long campaignId, Long companySiteId) {
@@ -71,6 +71,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
         List<ScenarioAnswer> lstAnswersToInsert = new ArrayList<>();
         try {
             ScenarioQuestion scenarioQuestion = modelMapper.map(scenarioQuestionDTO, ScenarioQuestion.class);
+
             scenarioQuestion.setCreateTime(new Date());
             scenarioQuestion.setStatus((short) 1);
             scenarioQuestionRepository.save(scenarioQuestion);
@@ -85,19 +86,23 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
                     ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
                     lstAnswersToInsert.add(answer);
                 });
+
                 scenarioAnswerRepository.saveAll(lstAnswersToInsert);
-                CampaignLog campaignLogAnswer = new CampaignLog();
-                campaignLogAnswer.setCompanySiteId(scenarioQuestion.getCompanySiteId());
-                campaignLogAnswer.setCreateTime(new Date());
-                campaignLogAnswer.setAgentId(null);
-                campaignLogAnswer.setTableName("SCENARIO_ANSWER");
-                campaignLogAnswer.setColumnName(null);
-                campaignLogAnswer.setPreValue(null);
-                campaignLogAnswer.setPostValue(null);
-                campaignLogAnswer.setDescription("Them moi cau tra loi rieng le");
-                campaignLogAnswer.setCampaignId(scenarioQuestion.getCampaignId());
-                campaignLogAnswer.setCustomerId(scenarioQuestion.getScenarioQuestionId());
-                campaignLogRepository.save(campaignLogAnswer);
+
+                for (ScenarioAnswer a : lstAnswersToInsert) {
+                    CampaignLog campaignLogAnswer = new CampaignLog();
+                    campaignLogAnswer.setCompanySiteId(scenarioQuestion.getCompanySiteId());
+                    campaignLogAnswer.setCreateTime(new Date());
+                    campaignLogAnswer.setAgentId(null);
+                    campaignLogAnswer.setTableName("SCENARIO_ANSWER");
+                    campaignLogAnswer.setColumnName(null);
+                    campaignLogAnswer.setPreValue(null);
+                    campaignLogAnswer.setPostValue(null);
+                    campaignLogAnswer.setCampaignId(scenarioQuestion.getCampaignId());
+                    campaignLogAnswer.setCustomerId(a.getScenarioAnswerId());
+                    campaignLogAnswer.setDescription("Them moi cau tra loi");
+                    campaignLogRepository.save(campaignLogAnswer);
+                }
             }
 
             CampaignLog campaignLog = new CampaignLog();
@@ -128,8 +133,9 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
     public Long getMaxOrderId(Long scenarioId, Long campaignId, Long companySiteId) {
         try {
             Long index = scenarioQuestionRepository.getMaxOrderId(scenarioId, campaignId, companySiteId);
-            if(index == null) return 0L; else return index;
-        }catch (Exception ex) {
+            if (index == null) return 0L;
+            else return index;
+        } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }
         return null;
@@ -137,9 +143,9 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public Integer countDuplicateQuestionCode(String code, Long scenarioId, Long campaignId, Long companySiteId) {
+    public Integer countDuplicateQuestionCode(ScenarioQuestionDTO questionDTO) {
         try {
-            return scenarioQuestionRepository.countDuplicateQuestionCode(code, scenarioId, campaignId, companySiteId);
+            return questionRepositoryCustom.countDuplicateQuestionCode(questionDTO);
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
         }
@@ -195,7 +201,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
 
                     List<ScenarioAnswer> lstAnswer = scenarioAnswerRepository.findByScenarioQuestionIdAndCompanySiteIdAndStatusOrderByOrderIndex(scenarioQuestion.getScenarioQuestionId(),
                             scenarioQuestion.getCompanySiteId(), (short) 1);
-                    if(lstAnswer.size() > 0) {
+                    if (lstAnswer.size() > 0) {
                         lstAnswer.forEach(answer -> {
                             answer.setStatus((short) 0);
                             answer.setDeleteTime(new Date());
@@ -222,4 +228,78 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
         return resultDTO;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO update(ScenarioQuestionDTO scenarioQuestionDTO) {
+        ResultDTO resultDTO = new ResultDTO();
+        List<ScenarioAnswerDTO> lstAnswers = new ArrayList<>();
+        if (scenarioQuestionDTO.getScenarioQuestionId() == null) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            return resultDTO;
+        }
+        try {
+            ScenarioQuestion scenarioQuestion = modelMapper.map(scenarioQuestionDTO, ScenarioQuestion.class);
+
+            if (scenarioQuestion.getScenarioQuestionId() != null) {
+                scenarioQuestionRepository.save(scenarioQuestion);
+                CampaignLog campaignLog = new CampaignLog();
+                campaignLog.setCompanySiteId(scenarioQuestion.getCompanySiteId());
+                campaignLog.setCreateTime(new Date());
+                campaignLog.setAgentId(null);
+                campaignLog.setTableName("SCENARIO_QUESTION");
+                campaignLog.setColumnName(null);
+                campaignLog.setPreValue(null);
+                campaignLog.setPostValue(null);
+                campaignLog.setDescription("Chinh sua cau hoi rieng le");
+                campaignLog.setCampaignId(scenarioQuestion.getCampaignId());
+                campaignLog.setCustomerId(scenarioQuestion.getScenarioQuestionId());
+                campaignLogRepository.save(campaignLog);
+
+                if (scenarioQuestionDTO.getLstAnswers().size() > 0) {
+                    lstAnswers = scenarioQuestionDTO.getLstAnswers();
+
+                    lstAnswers.forEach(item -> {
+                        CampaignLog campaignLogAnswer = new CampaignLog();
+                        campaignLogAnswer.setCompanySiteId(scenarioQuestion.getCompanySiteId());
+                        campaignLogAnswer.setCreateTime(new Date());
+                        campaignLogAnswer.setAgentId(null);
+                        campaignLogAnswer.setTableName("SCENARIO_ANSWER");
+                        campaignLogAnswer.setColumnName(null);
+                        campaignLogAnswer.setPreValue(null);
+                        campaignLogAnswer.setPostValue(null);
+                        campaignLogAnswer.setCampaignId(scenarioQuestion.getCampaignId());
+
+                        if (item.getScenarioAnswerId() != null) {
+                            ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
+                            scenarioAnswerRepository.save(answer);
+                            campaignLogAnswer.setCustomerId(answer.getScenarioAnswerId());
+                            campaignLogAnswer.setDescription("Chinh sua cau tra loi");
+                            campaignLogRepository.save(campaignLogAnswer);
+                        } else {
+                            item.setCode(scenarioQuestion.getScenarioQuestionId() + "_" + item.getOrderIndex());
+                            item.setScenarioQuestionId(scenarioQuestion.getScenarioQuestionId());
+                            item.setCreateTime(new Date());
+                            item.setStatus((short) 1);
+                            ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
+                            scenarioAnswerRepository.save(answer);
+                            campaignLogAnswer.setCustomerId(answer.getScenarioAnswerId());
+                            campaignLogAnswer.setDescription("Them moi cau tra loi");
+                            campaignLogRepository.save(campaignLogAnswer);
+                        }
+                    });
+                }
+            }
+
+            resultDTO.setData(scenarioQuestion);
+            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/ScenarioServiceImpl.java

@@ -77,6 +77,7 @@ public class ScenarioServiceImpl implements ScenarioService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO sortQuestionAndAnswer(ScenarioDTO scenarioDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {

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

@@ -13,14 +13,15 @@ import java.util.ResourceBundle;
 public class BundleUtils {
     protected static final Logger logger = LoggerFactory.getLogger(BundleUtils.class);
     private static volatile ResourceBundle rsConfig = null;
+    private static final String GLOBAL_CONFIG = "config/globalConfig";
 
     public static String getLangString(String key, Locale... locale) {
         Locale vi = new Locale("vi");
         Locale mlocale = vi;
 
         try {
-            if(locale != null) {
-                if(locale.length == 0) {
+            if (locale != null) {
+                if (locale.length == 0) {
                     rsConfig = ResourceBundle.getBundle(Constants.LANGUAGE.LANGUAGE, mlocale);
                 } else {
                     rsConfig = ResourceBundle.getBundle(Constants.LANGUAGE.LANGUAGE, locale[0]);
@@ -34,4 +35,15 @@ public class BundleUtils {
             return key;
         }
     }
+
+    public static String getGlobalConfig(String configKey) {
+        String result = null;
+        try {
+            ResourceBundle bundle = ResourceBundle.getBundle(GLOBAL_CONFIG);
+            result = bundle.getString(configKey);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return result;
+    }
 }

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

@@ -43,4 +43,8 @@ public class Constants {
     public interface DATE_FORMAT {
         String FOMART_DATE_TYPE_1 = "DD/MM/YYYY";
     }
+
+    public interface MIME_TYPE {
+        String EXCEL_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+    }
 }

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

 package com.viettel.campaign.utils;
 
-import com.cronutils.model.definition.CronDefinition;
-import com.cronutils.model.definition.CronDefinitionBuilder;
-import com.cronutils.model.time.ExecutionTime;
-import com.cronutils.parser.CronParser;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
-import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.quartz.CronExpression;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.Duration;
-import java.time.ZonedDateTime;
 import java.util.Date;
-import java.util.Optional;
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.cronutils.model.CronType.QUARTZ;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
@@ -29,11 +20,24 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
 @Slf4j
 public final class DateTimeUtil {
     public static final long DAY_IN_MILLIS = 86400000L;
-    public static interface DateTimeProvider { long now(); }
+
+    public static interface DateTimeProvider {
+        long now();
+    }
+
     private static final AtomicReference<DateTimeProvider> PROVIDER = new AtomicReference<DateTimeProvider>();
-    public static final DateTimeProvider getProvider() { return PROVIDER.get(); }
+
+    public static final DateTimeProvider getProvider() {
+        return PROVIDER.get();
+    }
+
     static {
-        PROVIDER.set(new DateTimeProvider() { @Override public long now() { return System.currentTimeMillis(); } });
+        PROVIDER.set(new DateTimeProvider() {
+            @Override
+            public long now() {
+                return System.currentTimeMillis();
+            }
+        });
     }
 
     public static Date currentTime() {
@@ -47,7 +51,8 @@ public final class DateTimeUtil {
     public static final Date date(final long millis) {
         final int offset = getTimeZoneOffset(millis);
         long t = millis - ((t = (millis + offset) % DAY_IN_MILLIS) < 0 ? DAY_IN_MILLIS + t : t);
-        t = t + (offset - getTimeZoneOffset(t)); return new Date(t);
+        t = t + (offset - getTimeZoneOffset(t));
+        return new Date(t);
     }
 
     public static int getTimeZoneOffset(long millis) {
@@ -74,8 +79,8 @@ public final class DateTimeUtil {
     }
 
     public static String format(String pattern, Date date, String defaultValue) {
-        if(date == null) return defaultValue;
-        return format(pattern ,date.getTime());
+        if (date == null) return defaultValue;
+        return format(pattern, date.getTime());
     }
 
     /**
@@ -84,6 +89,7 @@ public final class DateTimeUtil {
     public static boolean isValid(final long millis) {
         return millis > 0L;
     }
+
     /**
      *
      */
@@ -99,9 +105,9 @@ public final class DateTimeUtil {
      *
      */
 
-    public static boolean isRun(String cron, Date lastCheck){
+    public static boolean isRun(String cron, Date lastCheck) {
         boolean isOk = false;
-        String format="dd-MMM-YYYY hh:mm:ss";
+        String format = "dd-MMM-YYYY hh:mm:ss";
 //        String cronExpression="* * 12 ? * FRI *";
         SimpleDateFormat sdf = new SimpleDateFormat(format);
         CronExpression expression = null;
@@ -110,14 +116,14 @@ public final class DateTimeUtil {
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        Date  currentDate = new Date();
+        Date currentDate = new Date();
         assert expression != null;
         Date lastDate = expression.getNextValidTimeAfter(lastCheck);
-        long interval =  lastDate.getTime() - currentDate.getTime();
-        if(interval <= 0){
+        long interval = lastDate.getTime() - currentDate.getTime();
+        if (interval <= 0) {
             isOk = true;
         }
 
-        return  isOk;
+        return isOk;
     }
 }

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

+package com.viettel.campaign.web.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+//import java.io.Serializable;
+import java.util.Date;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ContactCusResDTO {
+    private Long contactCustResultId;
+    private String campaignCode;
+    private String campaignName;
+    private String userName;
+    private String phoneNumber;
+    private String customerName;
+    private Date startCall;
+    private Date createTime;
+    private String contactStatus;
+    private String surveyStatus;
+    private String status;
+    private String recordStatus;
+    private Long callTime;
+    private Boolean enableEdit;
+    private Integer totalRow;
+}

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

@@ -24,4 +24,7 @@ public class CustomerListDTO extends BaseDTO {
     private Long totalCusInList;
     private Long totalCusInteract;
     private Long totalCusNotInteract;
+    private Long totalCusList;
+    private Long totalCusCampaign;
+    private Long totalCusCalled;
 }

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

@@ -11,23 +11,23 @@ import java.io.Serializable;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class FieldsToShowDTO extends BaseDTO implements Serializable {
+public class FieldsToShowDTO implements Serializable {
 
-    private Long campaignCusListColId;
+//    private Long campaignCusListColId;
 
-    private Long companySiteId;
+//    private Long companySiteId;
 
-    private Long campaignId;
+//    private Long campaignId;
 
     private String columnName;
 
     private String columnTitle;
 
-    private Long orderIndex;
+//    private Long orderIndex;
 
-    private Long customizeFieldId;
+//    private Long customizeFieldId;
 
-    private String customizeFieldTitle;
+//    private String customizeFieldTitle;
 
     private Boolean isFix;
 }

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

@@ -247,4 +247,17 @@ public class CampaignController {
         ResultDTO result = campaignExecuteService.getCustomerRecall(campaignId, customerId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
+
+    @PostMapping("/getCampaignCustomerList")
+    @ResponseBody
+    public ResponseEntity getCampaignCustomerList(@RequestBody CampaignRequestDTO campaignRequestDTO) {
+        ResultDTO resultDTO = campaignService.getCampaignCustomerList(campaignRequestDTO);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
+
+    @RequestMapping(value = "/renewCampaign", method = RequestMethod.PUT)
+    public ResponseEntity<ResultDTO> renewCampaign(@RequestBody CampaignDTO campaignDTO) {
+        ResultDTO result = campaignService.renewCampaign(campaignDTO);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 }

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

 package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
+import com.viettel.campaign.model.ccms_full.CustomizeFields;
+import com.viettel.campaign.service.CustomerService;
+import com.viettel.campaign.utils.BundleUtils;
+import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.RedisUtil;
 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;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
-import org.apache.log4j.Logger;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.commons.io.FilenameUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -21,17 +25,19 @@ import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.io.File;
 import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Controller
 @RequestMapping("/ipcc/customer")
 @CrossOrigin(origins = "*")
 public class CustomerController {
 
-    private static final Logger LOGGER = Logger.getLogger(CustomerController.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomerController.class);
 
-    @Autowired(required=true)
+    @Autowired(required = true)
     CustomerService customerService;
 
     @GetMapping("/findAll")
@@ -160,17 +166,15 @@ public class CustomerController {
         return new ResponseEntity(result, HttpStatus.OK);
     }
 
-    //<editor-fold desc="Download and import excel" defaultState="collapsed">
+    //<editor-fold desc="Download and import excel" defaultstate="collapsed">
     @GetMapping(value = "/downloadFileTemplate")
     public ResponseEntity<byte[]> downloadFileTemplate(@RequestParam("companySiteId") Long companySiteId) {
-        LOGGER.debug("--------DOWNLOAD FILE TEMPLATE---------");
+        LOGGER.info("--------DOWNLOAD FILE TEMPLATE---------");
         try {
-            customerService.buildTemplate(companySiteId);
-            File file = ResourceUtils.getFile("classpath:templates/import_customer_template.xlsx");
-            byte[] content = Files.readAllBytes(file.toPath());
+            byte[] content = customerService.buildTemplate(companySiteId);
             return ResponseEntity.ok()
-                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName())
-                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
+                    .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
                     .body(content);
         } catch (Exception e) {
             LOGGER.error(e.getMessage());
@@ -179,39 +183,29 @@ public class CustomerController {
     }
 
     @PostMapping(value = "/importFile")
-    public ResponseEntity<byte[]> importFile(@RequestParam("file") MultipartFile file) {
-        LOGGER.debug("--------IMPORT FILE TEMPLATE---------");
+    public ResponseEntity<?> importFile(@RequestParam("file") MultipartFile file,
+                                        @RequestParam("customerListId") Long customerListId,
+                                        @RequestHeader("X-Auth-Token") String authToken) {
+        LOGGER.info("------------IMPORT FILE TEMPLATE--------------");
+        Locale locale = new Locale("vi", "VN");
         try {
-            List<CustomerDTO> listCustomer = new ArrayList<>();
-            XSSFWorkbook workbook = new XSSFWorkbook(file.getInputStream());
-            XSSFSheet sheet = workbook.getSheetAt(0);
-            for (int i = 0; i < sheet.getPhysicalNumberOfRows(); i++) {
-                CustomerDTO customer = new CustomerDTO();
-                XSSFRow row = sheet.getRow(i);
-                customer.setCustomerId(Double.valueOf(row.getCell(0).getNumericCellValue()).longValue());
-                customer.setCreateDate(row.getCell(1).getDateCellValue());
-                customer.setName(row.getCell(2).getStringCellValue());
-                listCustomer.add(customer);
+            UserSession userSession = (UserSession) RedisUtil.getInstance().get(authToken);
+            if (file.isEmpty()) {
+                return new ResponseEntity<>(BundleUtils.getLangString("customer.fileNotSelected"), HttpStatus.OK);
             }
-//            for (int i = 0; i < listCustomer.size(); i++) {
-//                validate du lieu
-//            }
-//            if (okay) {
-//                for (int i = 0; i < listCustomer.size(); i++) {
-//                    customerService.createCustomer(listCustomer.get(i));
-//                }
-//                return ResponseEntity.ok()
-//                        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName())
-//                        .contentType(MediaType.APPLICATION_OCTET_STREAM)
-//                        .body(file.getBytes());
-//            } else {
-//                return ResponseEntity.ok()
-//                        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName())
-//                        .header("Message", "Validate failed!")
-//                        .contentType(MediaType.APPLICATION_OCTET_STREAM)
-//                        .body(file.getBytes());
-//            }
-            return null;
+            if (!Objects.equals(FilenameUtils.getExtension(file.getOriginalFilename()), Constants.FileType.xlsx)) {
+                return new ResponseEntity<>(BundleUtils.getLangString("customer.invalidTemplate", locale), HttpStatus.OK);
+            }
+            String path = saveUploadFile(file);
+            List<CustomizeFields> dynamicHeaders = customerService.getDynamicHeader(userSession.getCompanySiteId());
+            Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, userSession, customerListId);
+            File fileExport = (File) map.get("file");
+            String message = (String) map.get("message");
+            return ResponseEntity.ok()
+                    .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
+                    .header("Message", message)
+                    .body(Files.readAllBytes(fileExport.toPath()));
         } catch (Exception e) {
             LOGGER.error(e.getMessage());
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
@@ -233,7 +227,25 @@ public class CustomerController {
 
     @PostMapping("/getCustomizeField")
     public ResponseEntity<?> getCustomizeField(@RequestBody Long customerId) {
-        List<CustomizeFieldDTO> data = customerService.getCustomizeField(customerId);
+        List<CustomizeFieldObject> data = customerService.getCustomizeField(customerId);
         return new ResponseEntity<>(data, HttpStatus.OK);
     }
+
+    private String saveUploadFile(MultipartFile file) {
+        try {
+            String currentTime = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss").format(new Date());
+            String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "_" + currentTime + "." + FilenameUtils.getExtension(file.getOriginalFilename());
+            byte[] content = file.getBytes();
+            File uploadFolder = new File(BundleUtils.getGlobalConfig("import.uploadFolder"));
+            if (!uploadFolder.exists()) {
+                uploadFolder.mkdir();
+            }
+            Path path = Paths.get(BundleUtils.getGlobalConfig("import.uploadFolder"), fileName);
+            Files.write(path, content);
+            return path.toString();
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage());
+        }
+        return null;
+    }
 }

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/ipcc/campaign/scenario-question")
-@CrossOrigin
+@CrossOrigin("*")
 public class ScenarioQuestionController {
     @Autowired
     ScenarioQuestionService scenarioQuestionService;
@@ -39,8 +39,21 @@ public class ScenarioQuestionController {
         return scenarioQuestionService.getMaxOrderId(scenarioId, campaignId, companySiteId);
     }
 
-    @RequestMapping(value = "/count-duplicate-question-code", method = RequestMethod.GET)
-    public Integer countDuplicateQuestionCode(@RequestParam String code, @RequestParam Long scenarioId, @RequestParam Long campaignId, @RequestParam Long companySiteId) {
-        return scenarioQuestionService.countDuplicateQuestionCode(code, scenarioId, campaignId, companySiteId);
+    @RequestMapping(value = "/count-duplicate-question-code", method = RequestMethod.POST)
+    public Integer countDuplicateQuestionCode(@RequestBody ScenarioQuestionDTO questionDTO) {
+        return scenarioQuestionService.countDuplicateQuestionCode(questionDTO);
     }
+
+    @RequestMapping(value = "/delete", method = RequestMethod.POST)
+    public ResponseEntity<ResultDTO> deleteQuestion(@RequestBody ScenarioQuestionDTO scenarioQuestionDTO) {
+        ResultDTO resultDTO = scenarioQuestionService.delete(scenarioQuestionDTO);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
+
+    @RequestMapping(value="/update", method = RequestMethod.PUT)
+    public ResponseEntity<ResultDTO> update(@RequestBody ScenarioQuestionDTO scenarioQuestionDTO) {
+        ResultDTO resultDTO = scenarioQuestionService.update(scenarioQuestionDTO);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
+
 }

src/main/resources/application.yml

 server:
-  port: 1111
+  port: 9999
 spring:
   application:
     name: campaign

src/main/resources/config/globalConfig.properties

+#DEV
+import.uploadFolder=D:/temp/upload
+
+
+#STAGGING
+#import.uploadFolder=/root/temp/
+
+
+#PROD
+#import.uploadFolder=/root/temp/

src/main/resources/i18n/language_en.properties

@@ -64,3 +64,42 @@ CALL_ALLOWED = CALL_ALLOWED
 EMAIL_ALLOWED = EMAIL_ALLOWED
 SMS_ALLOWED = SMS_ALLOWED
 IPCC_STATUS = IPCC_STATUS
+EMAIL = EMAIL
+CUSTOMER_TYPE = CUSTOMER_TYPE
+AVATAR_LINK = AVATAR_LINK
+
+#Customer Excel Header
+customer.no = No
+customer.fullname = Full Name#Required\nLetters only\nmaximum 1000 characters
+customer.mainPhone = Main mobile phone#Number only\nmultiple numbers allowed\neach seperate by semicolon\nmaximum 50 characters
+customer.secondPhone = Secondary phone#Number only\nmultiple numbers allowed\neach seperate by semicolon\nmaximum 50 characters
+customer.email = Email#multiple emails allowed\neach seperate by semicolon\nmaximum 100 characters
+customer.address = Address#maximum 500 characters
+customer.cusType = Customer Type
+customer.companyName = Company#maximum 100 characters
+customer.description = Description#maximum 2000 characters
+customer.callAllowed = Call Allowed
+customer.emailAllowed = Email Allowed
+customer.smsAllowed = Sms Allowed
+customer.result = Result
+customer.cusType.normal = Normal
+customer.cusType.vip = VIP
+customer.cusType.blacklist = Blacklist
+customer.yes = Yes
+customer.not = No
+customer.invalidTemplate = Invalid Template
+customer.noData = Template empty
+customer.nameRequired = Full name required;
+customer.emailMax50 = Email must less than 50 character;
+customer.invalidCustomer = All 3 fields Main phone, second phone and email must not null;
+customer.importSuccess = Import Successful
+customer.importFailed = Import Failed
+customer.errorValidate = Error while validating
+customer.phoneMax50 = Mobile phone must less than 50 character;
+customer.phoneExists = Mobile phone exists;
+customer.notMatch = not match regexp validation
+customer.notGreaterThan = not greater than
+customer.notLessThan = not less than
+customer.importCustomer = IMPORT CUSTOMER
+customer.notice = Attention: A record is valid when Full Name is not null and one of three fields Main phone, secondary phone or email is not null
+customer.fileNotSelected=Please select a file

src/main/resources/i18n/language_vi.properties

@@ -66,3 +66,42 @@ CALL_ALLOWED = CALL_ALLOWED
 EMAIL_ALLOWED = EMAIL_ALLOWED
 SMS_ALLOWED = SMS_ALLOWED
 IPCC_STATUS = IPCC_STATUS
+EMAIL = EMAIL
+CUSTOMER_TYPE = CUSTOMER_TYPE
+AVATAR_LINK = AVATAR_LINK
+
+#Customer Excel Header
+customer.no = STT
+customer.fullname = Họ và tên#Bắt buộc\nĐịnh dạng chữ\ntối đa 1000 kí tự
+customer.mainPhone = Số điện thoại chính#Định dạng số\ncho phép nhập nhiều số điện thoại chính\ncác số cách nhau bởi dấu chấm phấy\ntối đa 50 ký tự
+customer.secondPhone = Số điện thoại phụ#Định dạng số\ncho phép nhập nhiều số điện thoại phụ\ncác số cách nhau bởi dấu chấm phấy hoặc dấu phẩy\ntối đa 50 ký tự
+customer.email=Email#Cho phép nhập nhiều email\nmỗi email cách nhau bởi dấu \";\"\ntối đa 100 ký tự
+customer.address = Địa chỉ#Tối đa 500 ký tự
+customer.cusType = Loại khách hàng
+customer.companyName = Công ty#Tối đa 100 ký tự
+customer.description = Ghi chú#Tối đa 2000 ký tự
+customer.callAllowed = Cho phép gọi ra
+customer.emailAllowed = Cho phép gửi email
+customer.smsAllowed = Cho phép gửi sms
+customer.result = Kết quả
+customer.cusType.normal = Thường
+customer.cusType.vip = VIP
+customer.cusType.blacklist = Blacklist
+customer.yes = Có
+customer.not = Không
+customer.invalidTemplate = Template sai định dạng
+customer.noData = Template không có dữ liệu
+customer.nameRequired = Họ và tên không được để trống;
+customer.emailMax50 = Email không được quá 50 kí tự;
+customer.invalidCustomer = Cả 3 thông tin số điện thoại chính, số điện phụ và email không được để trống;
+customer.importSuccess = Import dữ liệu thành công
+customer.importFailed = Import dữ liệu thất bại
+customer.errorValidate = Validate dữ liệu lỗi
+customer.phoneMax50 = Số điện thoại không được quá 50 kí tự;
+customer.phoneExists = Số điện thoại chính đã tồn tại;
+customer.notMatch = không đúng định dạng
+customer.notGreaterThan = không được lớn hơn
+customer.notLessThan = không được nhỏ hơn
+customer.importCustomer = IMPORT KHÁCH HÀNG
+customer.notice = Chú ý: 1 bản ghi được coi là hợp lệ bắt buộc phải có thông tin Họ và Tên và 1 trong 3 thông tin liên lạc (số điện thoại chính, số điện thoại phụ hoặc email)
+customer.fileNotSelected=Bạn chưa chọn file

src/main/resources/sql/campaign-mng/get-customize-field.sql

-select CUSTOMIZE_FIELD_OBJECT_ID customizeFieldObjectId,
-OBJECT_ID objectId,
-CUSTOMIZE_FIELDS_ID customizeFieldId,
-VALUE_TEXT valueText,
-VALUE_NUMBER valueNumber,
-VALUE_DATE valueDate,
-VALUE_CHECKBOX valueCheckbox,
-CREATE_BY createBy,
-CREATE_DATE createDate,
-UPDATE_BY updateBy,
-UPDATE_DATE updateDate,
-STATUS status,
-FIELD_OPTION_VALUE_ID fieldOptionValueId,
-TITLE title,
-FUNCTION_CODE functionCode
-from customize_field_object
-where function_code = 'CUSTOMER' and object_id = :p_customer_id
\ No newline at end of file

src/main/resources/sql/campaign-mng/get-list-campaign-customer.sql

+with customer_table as (
+    select count(a.customer_id) totalCustomer, a.customer_list_id customerListId from customer_list_mapping a
+    left join customer b on a.customer_id = b.customer_id
+    where b.status = 1
+    group by a.customer_list_id
+),
+campaign_customer_table as (
+    select count(a.customer_id) campaignCustomer, a.customer_list_id customerListId, a.campaign_id from campaign_customer a
+    where a.campaign_id = :p_campaign_id
+    group by a.customer_list_id, a.campaign_id
+),
+customer_interactive_table as (
+    select count(a.customer_id) campaignCustomerCalled, a.customer_list_id customerListId, a.campaign_id from campaign_customer a
+    where a.status <> 0 and a.campaign_id = :p_campaign_id
+    group by a.customer_list_id, a.campaign_id
+),
+customer_not_interactive_table as (
+    select count(a.customer_id) cusNotInteractive, a.customer_list_id customerListId, a.campaign_id from campaign_customer a
+    where a.status = 0 and a.campaign_id = :p_campaign_id and a.in_campaign_status = 1
+    group by a.customer_list_id, a.campaign_id
+)
+select  a.customer_list_id customerListId,
+        a.customer_list_code customerListCode,
+        a.customer_list_name customerListName,
+        nvl(b.totalCustomer, 0) totalCusList,
+        nvl(c.campaignCustomer, 0) totalCusCampaign,
+        nvl(d.campaignCustomerCalled, 0) totalCusCalled,
+        nvl(e.cusNotInteractive, 0) totalCusNotInteract
+from customer_list a
+left join customer_table b on a.customer_list_id = b.customerListId
+left join campaign_customer_table c on a.customer_list_id = c.customerListId
+left join customer_interactive_table d on a.customer_list_id = d.customerListId
+left join customer_not_interactive_table e on a.customer_list_id = e.customerListId

src/main/resources/sql/campaign-mng/get-list-fields-not-show.sql

@@ -2,7 +2,7 @@ with column_name_temp as (
     select column_name columnName, 1 isFix from user_tab_columns, dual
     where table_name = 'CUSTOMER'
 )
-select * from column_name_temp where columnName not in (select column_name from campaign_customerlist_column)
+select * from column_name_temp where columnName not in (select column_name from campaign_customerlist_column where column_name is not null)
 union all
 select title columnName, 0 isFix from customize_fields, dual
 where function_code = 'CUSTOMER'

src/main/resources/sql/campaign-mng/get-list-fields-to-show.sql

-select to_char(column_name) columnName, 1 isFix from campaign_customerlist_column, dual where campaign_id = :p_campaign_id
+select to_char(column_name) columnName, 1 isFix from campaign_customerlist_column, dual where campaign_id = :p_campaign_id and column_name is not null
 union all
 select customize_field_title columnName, 0 isFix from campaign_customerlist_column where campaign_id = :p_campaign_id

src/test/java/com/viettel/econtact/ServiceCampaignApplicationTests.java

+package com.viettel.econtact;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ServiceCampaignApplicationTests {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}