anhvd commit scenario classes

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;
@@ -25,19 +26,19 @@ import java.util.concurrent.ScheduledFuture;
  * @project campaign
  */
 
-@Slf4j
-@EnableScheduling
-@Configuration
-public class JobConfig implements SchedulingConfigurer {
-
-    TaskScheduler taskScheduler;
-    private ScheduledFuture<?> job1;
-    private ScheduledFuture<?> job2;
-
-    @Bean
-    public CampaignJob campaignJob(){
-        return new CampaignJob();
-    }
+//@Slf4j
+//@EnableScheduling
+//@Configuration
+//public class JobConfig implements SchedulingConfigurer {
+//
+//    TaskScheduler taskScheduler;
+//    private ScheduledFuture<?> job1;
+//    private ScheduledFuture<?> job2;
+//
+//    @Bean
+//    public CampaignJob campaignJob(){
+//        return new CampaignJob();
+//    }
 
 //    @Override
 //    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
@@ -52,47 +53,47 @@ public class JobConfig implements SchedulingConfigurer {
 //        taskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
 //    }
 
-    private void job1(TaskScheduler scheduler) {
-        job1 = scheduler.schedule(() -> {
-            log.info("processing job1 ...");
-            log.info(Thread.currentThread().getName() + " The Task1 executed at " + new Date());
-            try {
-                Thread.sleep(10000);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        }, triggerContext -> {
-
-            String cronExp = "0/5 * * * * ?";// Can be pulled from a db .
-            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
-        });
-    }
-
-    private void job2(TaskScheduler scheduler) {
-        job2 = scheduler.schedule(() -> {
-            log.info(Thread.currentThread().getName() + " The Job executed at " + new Date());
-            campaignJob().process();
-
-        }, triggerContext -> {
-            String cronExp = "0/1 * * * * ?";// Can be pulled from a db . This will run every minute
-            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
-        });
-    }
-
-
-
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
-        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
-        threadPoolTaskScheduler.setPoolSize(10);
-        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
-        threadPoolTaskScheduler.initialize();
-        scheduledTaskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
-//        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
-        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), triggerContext -> {
-            CronTrigger trigger = new CronTrigger("0/5 * * * * ?");
-            return trigger.nextExecutionTime(triggerContext);
-        });
-    }
-}
+//    private void job1(TaskScheduler scheduler) {
+//        job1 = scheduler.schedule(() -> {
+//            log.info("processing job1 ...");
+//            log.info(Thread.currentThread().getName() + " The Task1 executed at " + new Date());
+//            try {
+//                Thread.sleep(10000);
+//            } catch (InterruptedException e) {
+//                // TODO Auto-generated catch block
+//                e.printStackTrace();
+//            }
+//        }, triggerContext -> {
+//
+//            String cronExp = "0/5 * * * * ?";// Can be pulled from a db .
+//            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
+//        });
+//    }
+//
+//    private void job2(TaskScheduler scheduler) {
+//        job2 = scheduler.schedule(() -> {
+//            log.info(Thread.currentThread().getName() + " The Job executed at " + new Date());
+//            campaignJob().process();
+//
+//        }, triggerContext -> {
+//            String cronExp = "0/1 * * * * ?";// Can be pulled from a db . This will run every minute
+//            return new CronTrigger(cronExp).nextExecutionTime(triggerContext);
+//        });
+//    }
+//
+//
+//
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+//        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+//        threadPoolTaskScheduler.setPoolSize(10);
+//        threadPoolTaskScheduler.setThreadNamePrefix("scheduler-thread");
+//        threadPoolTaskScheduler.initialize();
+//        scheduledTaskRegistrar.setTaskScheduler(threadPoolTaskScheduler);
+////        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), (TriggerContext triggerContext) -> yourService.getCron());
+//        scheduledTaskRegistrar.addTriggerTask(() -> campaignJob().process(), triggerContext -> {
+//            CronTrigger trigger = new CronTrigger("0/5 * * * * ?");
+//            return trigger.nextExecutionTime(triggerContext);
+//        });
+//    }
+//}

src/main/java/com/viettel/campaign/model/acd_full/Agents.java

@@ -7,7 +7,7 @@ import javax.persistence.*;
 import java.util.Date;
 
 @Entity
-@Table(name = "Agents")
+@Table(name = "VSAUsers")
 @Getter
 @Setter
 public class Agents {

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

+package com.viettel.campaign.model.ccms_full;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Entity
+@Table(name = "VSA_USERS")
+@Getter
+@Setter
+
+public class VSAUsers {
+    @Id
+    @NotNull
+    @GeneratedValue(generator = "vsa_users_renew")
+    @SequenceGenerator(name = "vsa_users_renew", sequenceName = "vsa_users_renew", allocationSize = 1)
+    @Basic(optional = false)
+    @Column(name = "USER_ID")
+    private Long userId;
+    @Column(name = "USER_NAME")
+    private String userName;
+    @Column(name = "STATUS")
+    private Short status;
+    @Column(name = "FULL_NAME")
+    private String fullName;
+    @Column(name = "USER_TYPE_ID")
+    private Long userTypeId;
+    @Column(name = "CREATE_DATE")
+    private Date createDate;
+    @Column(name = "DESCRIPTION")
+    private String description;
+    @Column(name = "STAFF_CODE")
+    private String staffCode;
+    @Column(name = "MANAGER_ID")
+    private Long managerId;
+    @Column(name = "LOCATION_ID")
+    private Long locationId;
+    @Column(name = "DEPT_ID")
+    private Long deptId;
+    @Column(name = "DEPT_LEVEL")
+    private String deptLevel;
+    @Column(name = "POS_ID")
+    private Long posId;
+    @Column(name = "DEPT_NAME")
+    private String deptName;
+    @Column(name = "GROUP_ID")
+    private Long groupId;
+    @Column(name = "SITE_ID")
+    private Long siteId;
+    @Column(name = "COMPANY_SITE_ID")
+    private Long companySiteId;
+    @Column(name = "AGENT_TYPE")
+    private Short agentType;
+    @Column(name = "MOBILE_NUMBER")
+    private String mobileNumber;
+    @Column(name = "FACEBOOK_ID")
+    private String facebookId;
+    @Column(name = "LOGIN_TYPE")
+    private Short loginType;
+    @Column(name = "GOOGLE_ID")
+    private String googleId;
+    @Column(name = "EMAIL")
+    private String email;
+    @Column(name = "AVAILABLE_TICKET")
+    private Long availableTicket;
+    @Column(name = "USER_KAZOO_ID")
+    private String userKazooId;
+}

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

@@ -17,7 +17,6 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
     @Query(" select u FROM CampaignCompleteCode u WHERE u.status = 1")
     Page<CampaignCompleteCode> findAll(Pageable pageable);
 
-    //    Page<CampaignCompleteCode> findAllByStatus(String status, Pageable pageable);
 
     @Query("FROM CampaignCompleteCode WHERE completeName LIKE concat('%', :name, '%') ")
     List<CampaignCompleteCode> findByName(@Param("name") String name, Pageable pageable);
@@ -25,24 +24,24 @@ public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCo
     List<CampaignCompleteCode> findByCompleteNameContains(String name, Pageable pageable);
 
     @Modifying
-    @Query("update CampaignCompleteCode c set c.status = 0  where c.campaignCompleteCodeId in (:ids)")
-    int deleteds(@Param("ids") List<Long> ids);
+    @Query("update CampaignCompleteCode c set c.status = 0  where c.campaignCompleteCodeId in (:p_ids) and c.companySiteId=:p_company_site_id" )
+    int deletedList(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
 
-    //    @Query(value="SELECT  max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
-    //    Short findByMaxCompanySiteId(Long companySiteId);
 
     List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
 
     @Query(value="SELECT max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
     Short findByMaxCompanySiteId(Long companySiteId);
-
-    //    List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
-
-    //    List<CampaignCompleteCode> findByCampaignIdContainsAndChanel(Long campaignId, String chanel);
+    @Modifying
+    @Query("update CampaignCompleteCode c set c.status = 0 where c.campaignCompleteCodeId=:p_campaignCompleteCode_list_id and c.companySiteId=:p_company_site_id")
+    int deleteCampaignCompleteCodeBy(@Param("p_campaignCompleteCode_list_id") Long p_campaignCompleteCode_list_id, @Param("p_company_site_id") Long p_company_site_id);
 
     @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue = :completeValue AND completeType = :completeType AND companySiteId = :companySiteId")
     List<CampaignCompleteCode> getCustomerStatus(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
 
     @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue <> :completeValue AND completeType = :completeType AND companySiteId = :companySiteId")
     List<CampaignCompleteCode> getCustomerStatusWithoutValue(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
+
+    @Query("select c from CampaignCompleteCode c where c.companySiteId =:p_company_site_id")
+    List<CampaignCompleteCode> findAllCampaignCompleteCode();
 }

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.model.ccms_full.VSAUsers;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface VSAUsersRepository extends JpaRepository<VSAUsers, Long> {
+    List<VSAUsers> findAllByCompanySiteId(Long companySiteId);
+}

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

@@ -4,4 +4,6 @@ import com.viettel.campaign.web.dto.ResultDTO;
 
 public interface AgentsService {
     ResultDTO getAgentsByAgentId(String agentId);
+
+    ResultDTO getAllAgentsByCompanySiteId(int page, int pageSize, Long companySiteId);
 }

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

@@ -2,13 +2,14 @@ package com.viettel.campaign.service;
 
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.request_dto.CampaignCompleteCodeRequestDTO;
 
 import java.util.List;
 import java.util.Map;
 
 public interface CampaignCompleteCodeService {
 
-    Map listAllCompleteCode(int page, int pageSize, String sort);
+    ResultDTO listAllCompleteCode(int page, int pageSize, String sort,Long companySiteId);
 
     Map listCompleteCodeByName(int page, int pageSize, String sort, String name);
 
@@ -16,9 +17,9 @@ public interface CampaignCompleteCodeService {
 
     ResultDTO updateCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
 
-    ResultDTO deleteCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
+    ResultDTO deleteCompleteCode(CampaignCompleteCodeRequestDTO completeCodeDTO);
 
-    ResultDTO deleteList(List<Long> completeCodeDtos);
+    ResultDTO deleteList(CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO);
 
     ResultDTO deleteById(Long id);
 
@@ -28,4 +29,6 @@ public interface CampaignCompleteCodeService {
 
     ResultDTO getListStatusWithoutType(String completeValue, Short completeType, Long companySiteId);
 
+    ResultDTO editCampaignCompleteCode (Long campaignCompleteCodeId);
+
 }

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

@@ -45,5 +45,7 @@ public interface CampaignService {
 
     List<TimeZoneDialMode> getCampaignTimeZoneMode (Long campaignId, Long companySiteId);
 
-    ResultDTO renewCampaign (CampaignDTO campaignDTO);
+    ResultDTO renewCampaign(CampaignDTO campaignDTO);
+
+    ResultDTO updateCampaign(CampaignDTO dto);
 }

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

@@ -6,6 +6,7 @@ import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 
+import java.io.File;
 import java.util.Date;
 import java.util.List;
 
@@ -57,8 +58,11 @@ public interface CustomerService {
     ResultDTO getCustomerRecall(Long campaignId, Long customerId);
 
     List<Customer> findAllByCondition(Long siteId, Date endTime);
-
     Customer update(Customer c);
 
+    List<DynamicExcelHeaderDTO> getDynamicHeader(Long companySiteId);
+
+    void buildTemplate(Long companySiteId);
 
+    List<CustomizeFieldDTO> getCustomizeField(Long customerId);
 }

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

@@ -4,10 +4,25 @@ import com.viettel.campaign.model.acd_full.Agents;
 import com.viettel.campaign.repository.acd_full.AgentsRepository;
 import com.viettel.campaign.service.AgentsService;
 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.ResultDTO;
+import com.viettel.campaign.web.dto.VSAUsersDTO;
+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;
 
+import java.util.List;
+
 @Service
 public class AgentsServiceImpl implements AgentsService {
 
@@ -32,4 +47,87 @@ public class AgentsServiceImpl implements AgentsService {
 
         return result;
     }
+
+    @Override
+    public ResultDTO getAllAgentsByCompanySiteId(int page, int pageSize, Long companySiteId) {
+        ResultDTO resultDTO = new ResultDTO();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        if (DataUtil.isNullOrZero(companySiteId)) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            return resultDTO;
+        }
+
+        try {
+            StringBuilder sqlStrBuilder = new StringBuilder();
+            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
+
+            sqlStrBuilder.append(" LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
+            sqlStrBuilder.append(" WHERE 1 = 1");
+            sqlStrBuilder.append(" AND a.COMPANY_SITE_ID = :p_company_site_id");
+            sqlStrBuilder.append(" AND b.AGENT_ID IS NULL");
+            sqlStrBuilder.append(" ORDER BY a.FULL_NAME ASC");
+
+            SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
+
+            query.setParameter("p_company_site_id", companySiteId);
+
+            query.addScalar("userId", new LongType());
+            query.addScalar("userName", new StringType());
+            query.addScalar("status", new ShortType());
+            query.addScalar("fullName", new StringType());
+            query.addScalar("userTypeId", new LongType());
+            query.addScalar("createDate", new DateType());
+            query.addScalar("description", new StringType());
+            query.addScalar("staffCode", new StringType());
+            query.addScalar("managerId", new LongType());
+            query.addScalar("locationId", new LongType());
+            query.addScalar("deptId", new LongType());
+            query.addScalar("deptLevel", new StringType());
+            query.addScalar("posId", new LongType());
+            query.addScalar("deptName", new StringType());
+            query.addScalar("groupId", new LongType());
+            query.addScalar("siteId", new LongType());
+            query.addScalar("companySiteId", new LongType());
+            query.addScalar("agentType", new ShortType());
+            query.addScalar("mobileNumber", new StringType());
+            query.addScalar("facebookId", new StringType());
+            query.addScalar("loginType", new ShortType());
+            query.addScalar("googleId", new StringType());
+            query.addScalar("email", new StringType());
+            query.addScalar("availableTicket", new LongType());
+            query.addScalar("userKazooId", new StringType());
+            query.addScalar("filterType", new ShortType());
+
+            query.setResultTransformer(Transformers.aliasToBean(VSAUsersDTO.class));
+            int count = 0;
+            List<VSAUsersDTO> dtoList = query.list();
+            if (dtoList.size() > 0) {
+                count = query.list().size();
+            }
+
+            Pageable pageable = PageRequest.of(page, pageSize);
+            if (pageable != null) {
+                query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
+                query.setMaxResults(pageable.getPageSize());
+            }
+
+            List<VSAUsersDTO> data = query.list();
+            Page<VSAUsersDTO> 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/service/impl/CampaignServiceImpl.java

@@ -382,6 +382,66 @@ public class CampaignServiceImpl implements CampaignService {
         return resultDTO;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO updateCampaign(CampaignDTO dto) {
+        ResultDTO resultDTO = new ResultDTO();
+        List<TimeZoneDialModeDTO> lstTimeZone = dto.getLstTimeZone();
+        List<TimeRangeDialModeDTO> lstTimeRange = dto.getLstTimeRange();
+//        Campaign campaignEntity = modelMapper.map(dto, Campaign.class);
+        Campaign campaignEntity = new Campaign();
+        campaignEntity.setCampaignId(dto.getCampaignId());
+        campaignEntity.setContent(dto.getContent());
+        campaignEntity.setCustomerNumber(dto.getCustomerNumber());
+        campaignEntity.setStartTime(dto.getStartTime());
+        campaignEntity.setEndTime(dto.getEndTime());
+        campaignEntity.setMaxRecall(dto.getMaxRecall());
+        campaignEntity.setRecallType(dto.getRecallType());
+        campaignEntity.setRecallDuration(dto.getRecallDuration());
+        campaignEntity.setUpdateBy(dto.getUpdateBy());
+        campaignEntity.setUpdateTime(dto.getUpdateTime());
+        campaignEntity.setCampaignType(dto.getCampaignType());
+        campaignEntity.setProcessStatus(null);
+        campaignEntity.setDialMode(null);
+        campaignEntity.setTimeRange(null);
+        campaignEntity.setCurrentTimeMode(dto.getCurrentTimeMode());
+        campaignEntity.setIsApplyCustLock(dto.getIsApplyCustLock());
+        campaignEntity.setWrapupTimeConnect(dto.getWrapupTimeConnect());
+        campaignEntity.setWrapupTimeDisconnect(dto.getWrapupTimeDisconnect());
+        campaignEntity.setPreviewTime(dto.getPreviewTime());
+        campaignEntity.setRateDial(dto.getRateDial());
+        campaignEntity.setRateMiss(dto.getRateMiss());
+        campaignEntity.setAvgTimeProcess(dto.getAvgTimeProcess());
+        campaignEntity.setMusicList(dto.getMusicList());
+        campaignEntity.setTimePlayMusic(dto.getTimePlayMusic());
+        campaignEntity.setCampaignStart(dto.getCampaignStart());
+        campaignEntity.setCampaignEnd(dto.getCampaignEnd());
+        campaignEntity.setTimeWaitAgent(null);
+        campaignEntity.setQuestIndex(null);
+        try {
+            // Save campaign to database
+            campaignRepository.save(campaignEntity);
+            // Save time dial
+            for (TimeRangeDialModeDTO timeRangeDto : lstTimeRange) {
+                timeRangeDto.setCampaignId(dto.getCampaignId());
+                TimeRangeDialMode timeRangeEntity = modelMapper.map(timeRangeDto, TimeRangeDialMode.class);
+                timeRangeDialModeRepository.save(timeRangeEntity);
+            }
+            for (TimeZoneDialModeDTO timeZoneDto : lstTimeZone) {
+                timeZoneDto.setCampaignId(dto.getCampaignId());
+                TimeZoneDialMode timeZoneEntity = modelMapper.map(timeZoneDto, TimeZoneDialMode.class);
+                timeZoneDialModeRepository.save(timeZoneEntity);
+            }
+            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;
+    }
+
     private String generateCampaignCode(String campaignType, Short chanel) {
         int year = Calendar.getInstance().get(Calendar.YEAR);
         String maxIndexStr = campaignRepositoryCustom.getMaxCampaignIndex();

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

@@ -7,6 +7,7 @@ import com.viettel.campaign.mapper.CustomerMapper;
 import com.viettel.campaign.model.ccms_full.Customer;
 import com.viettel.campaign.model.ccms_full.CustomerContact;
 import com.viettel.campaign.model.ccms_full.CustomerList;
+import com.viettel.campaign.model.ccms_full.VSAUsers;
 import com.viettel.campaign.repository.ccms_full.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.utils.Constants;
@@ -16,6 +17,11 @@ import com.viettel.campaign.utils.SQLBuilder;
 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 org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -33,11 +39,17 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ResourceUtils;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.sql.DataSource;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.*;
 
 @Service
@@ -69,6 +81,9 @@ public class CustomerServiceImpl implements CustomerService {
     @Qualifier(DataSourceQualify.NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL)
     NamedParameterJdbcTemplate namedParameterJdbcTemplate;
 
+    @Autowired
+    VSAUsersRepository vsaUsersRepository;
+
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO getAllCustomer(int page, int pageSize, String sort, long customerListId, long companySiteId) {
@@ -88,7 +103,7 @@ public class CustomerServiceImpl implements CustomerService {
             StringBuilder sqlStrBuilder = new StringBuilder();
             sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-customer-detail-by-params"));
 
-            sqlStrBuilder.append(" ORDER BY name DESC");
+            sqlStrBuilder.append(" ORDER BY b.NAME ASC");
 
             SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
 
@@ -110,13 +125,6 @@ public class CustomerServiceImpl implements CustomerService {
             query.addScalar("ipccStatus", new StringType());
             query.addScalar("mobileNumber", new StringType());
             query.addScalar("email", new StringType());
-            query.addScalar("title", new StringType());
-            query.addScalar("type", new StringType());
-            query.addScalar("valueCombobox", new StringType());
-            query.addScalar("valueCheckbox", new ShortType());
-            query.addScalar("valueDate", new DateType());
-            query.addScalar("valueNumber", new LongType());
-            query.addScalar("valueText", new StringType());
 
             query.setResultTransformer(Transformers.aliasToBean(CustomerCustomDTO.class));
             int count = 0;
@@ -685,6 +693,54 @@ public class CustomerServiceImpl implements CustomerService {
         return result;
     }
 
+    @Override
+    public List<DynamicExcelHeaderDTO> getDynamicHeader(Long companySiteId) {
+        List<DynamicExcelHeaderDTO> headerList;
+        try {
+            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_CUSTOMER_MNG, "get-dynamic-header");
+            Map<String, Object> param = new HashMap<>();
+            param.put("p_company_site_id", companySiteId);
+            headerList = namedParameterJdbcTemplate.query(sql, param, new BeanPropertyRowMapper<>(DynamicExcelHeaderDTO.class));
+        } catch (Exception e) {
+            return null;
+        }
+        return headerList;
+    }
+
+    @Override
+    public void buildTemplate(Long companySiteId) {
+        try {
+            List<DynamicExcelHeaderDTO> headerList = getDynamicHeader(companySiteId);
+            FileInputStream fis = new FileInputStream(ResourceUtils.getFile("classpath:templates/import_customer_template.xlsx"));
+            XSSFWorkbook workbook = new XSSFWorkbook(fis);
+            XSSFSheet sheet = workbook.getSheetAt(0);
+            Row row = sheet.getRow(2);
+            Cell cell = row.createCell(row.getPhysicalNumberOfCells());
+            cell.setCellType(CellType.STRING);
+            cell.setCellValue("test");
+            FileOutputStream fos = new FileOutputStream(ResourceUtils.getFile("classpath:templates/import_customer_template.xlsx"));
+            workbook.write(fos);
+            fos.close();
+            workbook.close();
+        } catch (Exception e) {
+
+        }
+    }
+
+    @Override
+    public List<CustomizeFieldDTO> getCustomizeField(Long customerId) {
+        List<CustomizeFieldDTO> customizeFieldDTOList;
+        try {
+            String sql = SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-customize-field");
+            Map<String, Object> param = new HashMap<>();
+            param.put("p_customer_id", customerId);
+            customizeFieldDTOList = namedParameterJdbcTemplate.query(sql, param, new BeanPropertyRowMapper<>(CustomizeFieldDTO.class));
+        } catch (Exception e) {
+            return null;
+        }
+        return customizeFieldDTOList;
+    }
+
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public List<CustomerListDTO> getCustomerListInfo(CampaignCustomerDTO campaignCustomerDTO) {

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

@@ -16,6 +16,7 @@ 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_MNG = "campaign-customer-mng";
 
     public static String getSqlQueryById(String module,
                                          String queryId) {

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

@@ -23,11 +23,4 @@ public class CustomerCustomDTO {
     String ipccStatus;
     String mobileNumber;
     String email;
-    String title;
-    String type;
-    String valueCombobox;
-    Short valueCheckbox;
-    Date valueDate;
-    Long valueNumber;
-    String valueText;
 }

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

+package com.viettel.campaign.web.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class CustomizeFieldDTO {
+    private Long customizeFieldObjectId;
+    private Long objectId;
+    private Long customizeFieldId;
+    private String valueText;
+    private Long valueNumber;
+    private Date valueDate;
+    private Long valueCheckbox;
+    private Date createBy;
+    private Date createDate;
+    private String updateBy;
+    private Date updateDate;
+    private Long status;
+    private Long fieldOptionValueId;
+    private String title;
+    private String functionCode;
+}

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

+package com.viettel.campaign.web.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class DynamicExcelHeaderDTO {
+    private Long customizeFieldId;
+    private Long siteId;
+    private String functionCode;
+    private String createBy;
+    private Date createDate;
+    private String updateBy;
+    private Date updateDate;
+    private Long status;
+    private String type;
+    private String title;
+    private String placeholder;
+    private String description;
+    private Long position;
+    private Long required;
+    private Long fieldOptionsId;
+    private String regexpForValidation;
+    private Long maxLength;
+    private Long minLength;
+    private Long min;
+    private Long max;
+    private Long active;
+}

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

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class VSAUsersDTO {
+    Long userId;
+    String userName;
+    Short status;
+    String fullName;
+    Long userTypeId;
+    Date createDate;
+    String description;
+    String staffCode;
+    Long managerId;
+    Long locationId;
+    Long deptId;
+    String deptLevel;
+    Long posId;
+    String deptName;
+    Long groupId;
+    Long siteId;
+    Long companySiteId;
+    Short agentType;
+    String mobileNumber;
+    String facebookId;
+    Short loginType;
+    String googleId;
+    String email;
+    Long availableTicket;
+    String userKazooId;
+    Short filterType;
+}

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

+package com.viettel.campaign.web.dto.request_dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+@Getter
+@Setter
+public class CampaignCompleteCodeRequestDTO {
+    List<Long> listId;
+    Long companySiteId;
+    Long campaignCompleteCodeID;
+}

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

@@ -25,4 +25,11 @@ public class AgentsController {
         ResultDTO result = agentsService.getAgentsByAgentId(agentId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
+
+    @GetMapping("/findAll")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> listAgentsByCompanySiteId(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("companySiteId") Long companySiteId) {
+        ResultDTO result = agentsService.getAllAgentsByCompanySiteId(page, pageSize, companySiteId);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.viettel.campaign.web.rest;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.service.CampaignCompleteCodeService;
+import com.viettel.campaign.web.dto.request_dto.CampaignCompleteCodeRequestDTO;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -24,8 +25,8 @@ public class CampaignCompleteCodeController {
 
     @GetMapping("/findAll")
     @ResponseBody
-    public ResponseEntity findAllCompleteCode(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
-        Map result = completeCodeService.listAllCompleteCode(page, pageSize, sort);
+    public ResponseEntity findAllCompleteCode(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort,@RequestParam("companySiteId") Long companySiteId) {
+        ResultDTO result = completeCodeService.listAllCompleteCode(page, pageSize, sort,companySiteId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -57,7 +58,8 @@ public class CampaignCompleteCodeController {
 
     @PostMapping("/update")
     @ResponseBody
-    public ResultDTO updateCompleteCode(@RequestBody @Valid CampaignCompleteCodeDTO completeCodeDTO) {
+    public ResultDTO updateCompleteCode(@RequestBody @Valid CampaignCompleteCodeDTO completeCodeDTO
+            ) {
         ResultDTO result = new ResultDTO();
         try {
             result = completeCodeService.updateCompleteCode(completeCodeDTO);
@@ -69,19 +71,31 @@ public class CampaignCompleteCodeController {
         }
         return result;
     }
+    @GetMapping("/edit")
+    @ResponseBody
+    public ResultDTO findCampaignCodeById(@RequestParam("campaignCompleteCodeId") Long campaignCompleteCodeId){
+        ResultDTO resultDTO = new ResultDTO();
+        try{
+           resultDTO = completeCodeService.editCampaignCompleteCode(campaignCompleteCodeId);
+        }catch (Exception e){
+            resultDTO.setErrorCode("-1");
+            LOGGER.error(e);
+        }
+        return resultDTO;
+    }
 
     @PostMapping("/delete")
     @ResponseBody
-    public ResultDTO deleteCompleteCode(@RequestBody @Valid CampaignCompleteCodeDTO completeCodeDTO) {
+    public ResultDTO deleteCompleteCode(@RequestBody @Valid CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO) {
         ResultDTO result = new ResultDTO();
-        result = completeCodeService.deleteCompleteCode(completeCodeDTO);
+        result = completeCodeService.deleteCompleteCode(campaignCompleteCodeRequestDTO);
         return result;
     }
 
     @PostMapping("/listDelete")
     @ResponseBody
-    public ResponseEntity<ResultDTO> deleteList(@RequestBody @Valid List<Long>completeCodeDtos ){
-        ResultDTO resultDTO = completeCodeService.deleteList(completeCodeDtos);
+    public ResponseEntity<ResultDTO> deleteLists(@RequestBody @Valid CampaignCompleteCodeRequestDTO campaignCompleteCodeRequestDTO){
+        ResultDTO resultDTO = completeCodeService.deleteList(campaignCompleteCodeRequestDTO);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 

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

@@ -2,8 +2,6 @@ package com.viettel.campaign.web.rest;
 
 import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
 import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
-import com.viettel.campaign.repository.ccms_full.TimeRangeDialModeRepository;
-import com.viettel.campaign.repository.ccms_full.TimeZoneDialModeRepository;
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
 import com.viettel.campaign.web.dto.CampaignDTO;
@@ -41,12 +39,6 @@ public class CampaignController {
     @Autowired
     CampaignExecuteService campaignExecuteService;
 
-    @Autowired
-    TimeRangeDialModeRepository timeRangeDialModeRepository;
-
-    @Autowired
-    TimeZoneDialModeRepository timeZoneDialModeRepository;
-
     @PostMapping("/searchCampaignExecute")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
@@ -84,6 +76,20 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @GetMapping("/findCampaignTimeRangeMode")
+    @ResponseBody
+    public ResponseEntity<?> findCampaignTimeRangeMode(@RequestParam("campaignId") Long campaignId, @RequestParam("companySiteId") Long companySiteId) {
+        List<TimeRangeDialMode> list = campaignService.getCampaignTimeRangeMode(campaignId, companySiteId);
+        return new ResponseEntity<>(list, HttpStatus.OK);
+    }
+
+    @GetMapping("/findCampaignTimeZoneMode")
+    @ResponseBody
+    public ResponseEntity<?> findCampaignTimeZoneMode(@RequestParam("campaignId") Long campaignId, @RequestParam("companySiteId") Long companySiteId) {
+        List<TimeZoneDialMode> list = campaignService.getCampaignTimeZoneMode(campaignId, companySiteId);
+        return new ResponseEntity<>(list, HttpStatus.OK);
+    }
+
     @PostMapping("/searchInteractiveResult")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchInteractiveResult(@RequestBody CampaignRequestDTO dto) throws Exception {
@@ -165,20 +171,11 @@ public class CampaignController {
         headers.setContentType(MediaType.parseMediaType("application/vnd.ms-excel"));
         return new ResponseEntity<byte[]>(contentReturn, headers, HttpStatus.OK);
     }
-    @RequestMapping(value = "/findCampaignTimeRangeMode", method = RequestMethod.GET)
-    public List<TimeRangeDialMode> findCampaignTimeRangeMode(@RequestParam Long campaignId, @RequestParam Long companySiteId) {
-        return timeRangeDialModeRepository.findTimeRangeDialModeByCampaignIdAndCompanySiteId(campaignId, companySiteId);
-    }
-
-    @RequestMapping(value = "/findCampaignTimeZoneMode", method = RequestMethod.GET)
-    public List<TimeZoneDialMode> findCampaignTimeZoneMode(@RequestParam Long campaignId, @RequestParam Long companySiteId) {
-        return timeZoneDialModeRepository.findTimeZoneDialModeByCampaignIdAndCompanySiteId(campaignId, companySiteId);
-    }
 
-    @RequestMapping(value = "/renewCampaign", method = RequestMethod.PUT)
-    public ResponseEntity<ResultDTO> renewCampaign(@RequestBody CampaignDTO campaignDTO) {
-        ResultDTO result = campaignService.renewCampaign(campaignDTO);
-        return new ResponseEntity<>(result, HttpStatus.OK);
+    @PostMapping("/updateCampaign")
+    @ResponseBody
+    public ResponseEntity<?> updateCampaign(@RequestBody CampaignDTO dto) {
+        ResultDTO resultDTO = campaignService.updateCampaign(dto);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
-
 }

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

 package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.web.dto.CustomerContactDTO;
-import com.viettel.campaign.web.dto.CustomerDTO;
-import com.viettel.campaign.web.dto.CustomerListDTO;
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
@@ -187,10 +184,11 @@ public class CustomerController {
     }
 
     @GetMapping(value = "/downloadFileTemplate")
-    public ResponseEntity<byte[]> downloadFileTemplate() {
+    public ResponseEntity<byte[]> downloadFileTemplate(@RequestParam("companySiteId") Long companySiteId) {
         LOGGER.debug("--------DOWNLOAD FILE TEMPLATE---------");
         try {
-            File file = ResourceUtils.getFile("classpath:templates/test_download.xlsx");
+            customerService.buildTemplate(companySiteId);
+            File file = ResourceUtils.getFile("classpath:templates/import_customer_template.xlsx");
             byte[] content = Files.readAllBytes(file.toPath());
             return ResponseEntity.ok()
                     .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName())
@@ -248,6 +246,12 @@ public class CustomerController {
                                                             @RequestParam("sort") String sort,
                                                             @RequestParam("campaignId") Long campaignId,
                                                             @RequestParam("companySiteId") Long companySiteId) {
-        return null;//customerService.searchCustomerListInfoFromCustomerList(page, pageSize, sort, campaignId, companySiteId);
+        return null;// customerService.searchCustomerListInfoFromCustomerList(page, pageSize, sort, campaignId, companySiteId);
+    }
+
+    @PostMapping("/getCustomizeField")
+    public ResponseEntity<?> getCustomizeField(@RequestBody Long customerId) {
+        List<CustomizeFieldDTO> data = customerService.getCustomizeField(customerId);
+        return new ResponseEntity<>(data, HttpStatus.OK);
     }
 }

src/main/resources/sql/campaign-customer-mng/get-dynamic-header.sql

+select CUSTOMIZE_FIELD_ID customizeFieldId,
+SITE_ID companySiteId,
+FUNCTION_CODE functionCode,
+CREATE_BY createBy,
+CREATE_DATE createDate,
+UPDATE_BY updateBy,
+UPDATE_DATE updateDate,
+STATUS status,
+TYPE type,
+TITLE title,
+PLACEHOLDER placeholder,
+DESCRIPTION description,
+POSITION position,
+REQUIRED required,
+FIELD_OPTIONS_ID fieldOptionsId,
+REGEXP_FOR_VALIDATION regexpForValidation,
+MAX_LENGTH maxLength,
+MIN min,
+MAX max,
+MIN_LENGTH minLength,
+ACTIVE active
+from customize_fields
+where function_code = 'CUSTOMER'
+and site_id = :p_company_site_id
\ No newline at end of file

src/main/resources/sql/campaign-mng/campaign-agents-by-params.sql

+SELECT
+    a.USER_ID userId,
+    a.USER_NAME userName,
+    a.STATUS status,
+    a.FULL_NAME fullName,
+    a.USER_TYPE_ID userTypeId,
+    a.CREATE_DATE createDate,
+    a.DESCRIPTION description,
+    a.STAFF_CODE staffCode,
+    a.MANAGER_ID managerId,
+    a.LOCATION_ID locationId,
+    a.DEPT_ID deptId,
+    a.DEPT_LEVEL deptLevel,
+    a.POS_ID posId,
+    a.DEPT_NAME deptName,
+    a.GROUP_ID groupId,
+    a.SITE_ID siteId,
+    a.COMPANY_SITE_ID companySiteId,
+    a.AGENT_TYPE agentType,
+    a.MOBILE_NUMBER mobileNumber,
+    a.FACEBOOK_ID facebookId,
+    a.LOGIN_TYPE loginType,
+    a.GOOGLE_ID googleId,
+    a.EMAIL email,
+    a.AVAILABLE_TICKET availableTicket,
+    a.USER_KAZOO_ID userKazooId,
+    b.FILTER_TYPE filterType
+FROM VSA_USERS a
+--          LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID
+-- WHERE 1 = 1
+--   AND a.COMPANY_SITE_ID = :p_company_site_id

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

--- select
---     a.CUSTOMER_LIST_MAPPING_ID customerListMappingId,
---     a.COMPANY_SITE_ID companySiteId,
---     a.CUSTOMER_LIST_ID customerListId,
---     a.CUSTOMER_ID customerId,
---     b.NAME name,
---     b.DESCRIPTION description,
---     b.COMPANY_NAME companyName,
---     b.CUSTOMER_TYPE customerType,
---     b.CURRENT_ADDRESS currentAddress,
---     b.CALL_ALLOWED callAllowed,
---     b.EMAIL_ALLOWED emailAllowed,
---     b.SMS_ALLOWED smsAllowed,
---     b.IPCC_STATUS ipccStatus,
---     c.MOBILE mobileNumber,
---     d.EMAIL email
--- from CUSTOMER_LIST_MAPPING a
---          join CUSTOMER b on a.CUSTOMER_ID = b.CUSTOMER_ID
---          left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS MOBILE
---                FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 5 GROUP BY CUSTOMER_ID) c on b.CUSTOMER_ID = c.CUSTOMER_ID
---          left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS EMAIL
---                FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 2 GROUP BY CUSTOMER_ID) d on b.CUSTOMER_ID = d.CUSTOMER_ID
--- where 1 = 1
---    and COMPANY_SITE_ID = :p_company_site_id
---    and CUSTOMER_LIST_ID = :p_customer_list_id
-
--- test dynamic field
-
 select
     a.CUSTOMER_LIST_MAPPING_ID customerListMappingId,
     a.COMPANY_SITE_ID companySiteId,
@@ -41,26 +13,53 @@ select
     b.SMS_ALLOWED smsAllowed,
     b.IPCC_STATUS ipccStatus,
     c.MOBILE mobileNumber,
-    d.EMAIL email,
-    e.TITLE title,
-    f.TYPE type,
-    h.VALUE_COMBOBOX valueCombobox,
-    e.VALUE_CHECKBOX valueCheckbox,
-    e.VALUE_DATE valueDate,
-    e.VALUE_NUMBER valueNumber,
-    e.VALUE_TEXT valueText
+    d.EMAIL email
 from CUSTOMER_LIST_MAPPING a
          join CUSTOMER b on a.CUSTOMER_ID = b.CUSTOMER_ID
          left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS MOBILE
-                    FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 5 GROUP BY CUSTOMER_ID) c on b.CUSTOMER_ID = c.CUSTOMER_ID
+               FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 5 GROUP BY CUSTOMER_ID) c on b.CUSTOMER_ID = c.CUSTOMER_ID
          left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS EMAIL
-                    FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 2 GROUP BY CUSTOMER_ID) d on b.CUSTOMER_ID = d.CUSTOMER_ID
-         left join CUSTOMIZE_FIELD_OBJECT e on b.CUSTOMER_ID = e.OBJECT_ID
-         left join CUSTOMIZE_FIELDS f on e.CUSTOMIZE_FIELDS_ID = f.CUSTOMIZE_FIELD_ID
-         left join (SELECT FIELD_OPTION_VALUE_ID, NAME AS VALUE_COMBOBOX
-                    FROM CUSTOMIZE_FIELD_OPTION_VALUE) h on h.FIELD_OPTION_VALUE_ID = e.FIELD_OPTION_VALUE_ID
+               FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 2 GROUP BY CUSTOMER_ID) d on b.CUSTOMER_ID = d.CUSTOMER_ID
 where 1 = 1
-  and a.COMPANY_SITE_ID = :p_company_site_id
-  and a.CUSTOMER_LIST_ID = :p_customer_list_id
-  and e.FUNCTION_CODE = 'CUSTOMER'
-order by a.CUSTOMER_ID
+   and a.COMPANY_SITE_ID = :p_company_site_id
+   and a.CUSTOMER_LIST_ID = :p_customer_list_id
+
+-- test dynamic field
+
+-- select
+--     a.CUSTOMER_LIST_MAPPING_ID customerListMappingId,
+--     a.COMPANY_SITE_ID companySiteId,
+--     a.CUSTOMER_LIST_ID customerListId,
+--     a.CUSTOMER_ID customerId,
+--     b.NAME name,
+--     b.DESCRIPTION description,
+--     b.COMPANY_NAME companyName,
+--     b.CUSTOMER_TYPE customerType,
+--     b.CURRENT_ADDRESS currentAddress,
+--     b.CALL_ALLOWED callAllowed,
+--     b.EMAIL_ALLOWED emailAllowed,
+--     b.SMS_ALLOWED smsAllowed,
+--     b.IPCC_STATUS ipccStatus,
+--     c.MOBILE mobileNumber,
+--     d.EMAIL email,
+--     e.TITLE title,
+--     f.TYPE type,
+--     h.VALUE_COMBOBOX valueCombobox,
+--     e.VALUE_CHECKBOX valueCheckbox,
+--     e.VALUE_DATE valueDate,
+--     e.VALUE_NUMBER valueNumber,
+--     e.VALUE_TEXT valueText
+-- from CUSTOMER_LIST_MAPPING a
+--          join CUSTOMER b on a.CUSTOMER_ID = b.CUSTOMER_ID
+--          left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS MOBILE
+--                     FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 5 GROUP BY CUSTOMER_ID) c on b.CUSTOMER_ID = c.CUSTOMER_ID
+--          left join (SELECT CUSTOMER_ID, LISTAGG(CONTACT, ', ') WITHIN GROUP (ORDER BY NULL) AS EMAIL
+--                     FROM CUSTOMER_CONTACT WHERE CONTACT_TYPE = 2 GROUP BY CUSTOMER_ID) d on b.CUSTOMER_ID = d.CUSTOMER_ID
+--          left join CUSTOMIZE_FIELD_OBJECT e on b.CUSTOMER_ID = e.OBJECT_ID
+--          left join CUSTOMIZE_FIELDS f on e.CUSTOMIZE_FIELDS_ID = f.CUSTOMIZE_FIELD_ID
+--          left join (SELECT FIELD_OPTION_VALUE_ID, NAME AS VALUE_COMBOBOX
+--                     FROM CUSTOMIZE_FIELD_OPTION_VALUE) h on h.FIELD_OPTION_VALUE_ID = e.FIELD_OPTION_VALUE_ID
+-- where 1 = 1
+--   and a.COMPANY_SITE_ID = :p_company_site_id
+--   and a.CUSTOMER_LIST_ID = :p_customer_list_id
+--   and e.FUNCTION_CODE = 'CUSTOMER'

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/search-individual-customer.sql

@@ -11,7 +11,8 @@ from customer_contact cc
 where cc.contact_type = 2
 and status = 1
 ), datas as (
-select c.name,
+select c.customer_id customerId,
+c.name,
 cP.phone,
 cE.email,
 c.customer_type cusType,

src/main/resources/sql/campaign-status-mng/findAll-CampaignCompleteCode.sql

+SELECT
+    CAMPAIGN_COMPLETE_CODE_ID campaignCompleteCodeId,
+    IS_RECALL isRecall ,
+    CAMPAIGN_ID campaignId,
+    COMPLETE_VALUE completeValue,
+    COMPLETE_NAME completeName,
+    COMPLETE_TYPE completeType,
+    CAMPAIGN_TYPE campaignType,
+    DESCRIPTION description,
+    STATUS  status,
+    COMPANY_SITE_ID companySiteId,
+    UPDATE_BY updateBy ,
+    UPDATE_AT updateAt,
+    CREATE_BY createBy,
+    CREATE_AT createAt,
+    IS_FINISH isFinish,
+    IS_LOCK isLock,
+    DURATION_LOCK durationLock,
+    CHANEL chanel
+
+
+FROM CAMPAIGN_COMPLETE_CODE
+where 1 = 1
+  AND STATUS = 1
+  and COMPANY_SITE_ID = :p_company_site_id
+

src/main/resources/sql/campaign-status-mng/findCampaignCodeById.sql

+SELECT  CAMPAIGN_COMPLETE_CODE_ID campaignCompleteCodeId,
+        IS_RECALL isRecall ,
+        CAMPAIGN_ID campaignId,
+        COMPLETE_VALUE completeValue,
+        COMPLETE_NAME completeName,
+        COMPLETE_TYPE completeType,
+        CAMPAIGN_TYPE campaignType,
+        DESCRIPTION description,
+        STATUS  status,
+        COMPANY_SITE_ID companySiteId,
+        UPDATE_BY updateBy ,
+        UPDATE_AT updateAt,
+        CREATE_BY createBy,
+        CREATE_AT createAt,
+        IS_FINISH isFinish,
+        IS_LOCK isLock,
+        DURATION_LOCK durationLock,
+        CHANEL chanel
+        from CAMPAIGN_COMPLETE_CODE WHERE CAMPAIGN_COMPLETE_CODE_ID=:p_campaignComleteCode

src/main/resources/sql/campaign-status-mng/get-max-value-completevalue.sql

-SELECT max(COMPLETE_VALUE) completeValue, COMPANY_SITE_ID companySiteId from CAMPAIGN_COMPLETE_CODE where COMPANY_SITE_ID = :p_site_id GROUP BY COMPANY_SITE_ID
+SELECT max(to_number(COMPLETE_VALUE)) completeValue, COMPANY_SITE_ID companySiteId from CAMPAIGN_COMPLETE_CODE where COMPANY_SITE_ID = :p_site_id GROUP BY COMPANY_SITE_ID

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

@@ -17,3 +17,4 @@ LEFT JOIN AP_PARAM c ON a.CAMPAIGN_TYPE = to_char(c.AP_PARAM_ID);
 
 
 
+