Merge remote-tracking branch 'origin/master'

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

@@ -12,5 +12,10 @@ import java.util.List;
 @Repository
 @Transactional(DataSourceQualify.CCMS_FULL)
 public interface ContactQuestResultRepository extends JpaRepository<ContactQuestResult, Long> {
+
     List<ContactQuestResultDTO> findByCompanySiteIdAndCampaignId(Long companySiteId, Long campaignId);
+
+    List<ContactQuestResult> findByContactCustResultId(Long contactCustResultId);
+
+    List<ContactQuestResult> findByCompanySiteIdAndCampaignIdAndCustomerId(Long companySiteId, Long campaignId, Long customerId);
 }

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

@@ -11,6 +11,8 @@ import java.util.List;
 public interface CustomerListMappingRepository extends JpaRepository<CustomerListMapping, Long> {
 
     // ----------- customer ------------ //
+    @Query("select c from CustomerListMapping c where c.customerId in (:p_ids) and c.customerListId =:p_customer_list_id and c.companySiteId=:p_company_site_id")
+    List<CustomerListMapping> findAllCustomerListMapping(@Param("p_ids") List<Long> p_ids, @Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);
 
     @Modifying
     @Query("delete from CustomerListMapping c where c.customerId=:p_customer_id and c.customerListId=:p_customer_list_id and c.companySiteId=:p_company_site_id")

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

@@ -123,7 +123,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             sql.append("    CCR.PHONE_NUMBER                AS phoneNumber, ");
             sql.append("    CUS.NAME                        AS customerName, ");
             sql.append("    CCR.START_CALL                  AS startCall, ");
-            sql.append("    CC1.COMPLETE_NAME               AS contactStatus, ");
+            sql.append("    CC1.COMPLETE_NAME               AS connectStatus, ");
             sql.append("    CC2.COMPLETE_NAME               AS surveyStatus, ");
             sql.append("    C.STATUS                        AS status, ");
             sql.append("    CCR.STATUS                      AS recordStatus, ");
@@ -291,7 +291,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 item.setPhoneNumber((String) obj[5]);
                 item.setCustomerName((String) obj[6]);
                 item.setStartCall(obj[7] == null ? null : (Date) obj[7]);
-                item.setContactStatus((Short) obj[8]);
+                item.setConnectStatus((String) obj[8]);
                 item.setSurveyStatus((String) obj[9]);
                 item.setStatus(obj[10] == null ? 0 : ((BigDecimal) obj[10]).shortValueExact());
                 item.setRecordStatus(obj[11] == null ? 0 : ((BigDecimal) obj[11]).shortValueExact());

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

@@ -122,11 +122,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
 
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode()) && !DataUtil.isNullOrEmpty(requestDto.getCampaignCode().trim())) {
-                if(requestDto.getCampaignCode().split(",").length > 1) {
-                    sb.append(" AND a.CAMPAIGN_CODE IN (:p_code) ");
-                }else {
-                    sb.append(" AND a.CAMPAIGN_CODE LIKE :p_code ");
-                }
+                sb.append(" AND a.CAMPAIGN_CODE IN (:p_code) ");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignName())) {
                 sb.append(" AND UPPER(a.CAMPAIGN_NAME) LIKE :p_name");
@@ -169,17 +165,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
             SQLQuery query = session.createSQLQuery(sb.toString());
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode()) && !DataUtil.isNullOrEmpty(requestDto.getCampaignCode().trim())) {
-                if(requestDto.getCampaignCode().split(",").length > 1) {
-                    String[] lstCode = requestDto.getCampaignCode().trim().split(",");
-                    query.setParameterList("p_code", lstCode);
-                }else {
-                    query.setParameter("p_code", "%" +
-                            requestDto.getCampaignCode().trim().toUpperCase()
-                                    .replace("\\", "\\\\")
-                                    .replaceAll("%", "\\%")
-                                    .replaceAll("_", "\\_")
-                            + "%");
-                }
+                String[] lstCode = requestDto.getCampaignCode().trim().split(",");
+                query.setParameterList("p_code", lstCode);
             }
 
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignName())) {

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

@@ -32,8 +32,6 @@ public interface CampaignExecuteService {
 
     ResultDTO getCallLog(ReceiveCustLogDTO dto);
 
-    ResultDTO getCallStatus(CampaignRequestDTO dto);
-
     ResultDTO getAgentLogout(CampaignRequestDTO dto);
 
     ResultDTO updateContactCustResult(ContactCustResultDTO dto, UserSession userSession);
@@ -50,7 +48,9 @@ public interface CampaignExecuteService {
 
     ResultDTO getCustomerInfor(Long companySiteId, Long customerId, Long campaignId);
 
-    ResultDTO createListContacQuestResult(List<ContactQuestResultDTO> dtoList);
+    ResultDTO createListContactQuestResult(List<ContactQuestResultDTO> dtoList);
+
+    ResultDTO updateListContactQuestResult(ContactQuestResultDTO dto);
 
     String getDialModeAtCurrent(Long campaignId, Long companySiteId);
 

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

 package com.viettel.campaign.service;
 
+import com.viettel.campaign.model.ccms_full.ContactQuestResult;
 import com.viettel.campaign.model.ccms_full.Scenario;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.econtact.filter.UserSession;
@@ -28,4 +29,6 @@ public interface ScenarioService {
     XSSFWorkbook buildTemplate() throws IOException;
 
     Map<String, Object> readAndValidateCustomer(String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException;
+
+    List<ContactQuestResult> getContactQuestResult(Long companySiteId, Long campaignId, Long customerId);
 }

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

@@ -314,16 +314,12 @@ public class AgentsServiceImpl implements AgentsService {
             sqlStrBuilder.append(" AND vu.COMPANY_SITE_ID = :p_company_site_id");
             sqlStrBuilder.append(" AND vu.STATUS = 1");
             sqlStrBuilder.append(" AND r.ROLE_CODE IN ('AGENT', 'SUPERVISOR')");
-            sqlStrBuilder.append(" AND vu.USER_ID NOT IN (SELECT vu.USER_ID         userId");
-            sqlStrBuilder.append("                         FROM VSA_USERS vu");
-            sqlStrBuilder.append("                             LEFT JOIN CAMPAIGN_AGENT ca on vu.USER_ID = ca.AGENT_ID");
-            sqlStrBuilder.append("                             INNER JOIN USER_ROLE ur on vu.USER_ID = ur.USER_ID");
-            sqlStrBuilder.append("                             INNER JOIN ROLE r on ur.ROLE_ID = r.ROLE_ID");
+            sqlStrBuilder.append(" AND vu.USER_ID NOT IN (SELECT vu.USER_ID");
+            sqlStrBuilder.append("                         FROM CAMPAIGN_AGENT ca");
+            sqlStrBuilder.append("                             INNER JOIN VSA_USERS vu ON ca.AGENT_ID = vu.USER_ID");
             sqlStrBuilder.append("                         WHERE 1 = 1");
-            sqlStrBuilder.append("                            AND vu.COMPANY_SITE_ID = :p_company_site_id");
-            sqlStrBuilder.append("                            AND vu.STATUS = 1");
+            sqlStrBuilder.append("                            AND ca.COMPANY_SITE_ID = :p_company_site_id");
             sqlStrBuilder.append("                            AND ca.CAMPAIGN_ID = :p_campaign_id");
-            sqlStrBuilder.append("                            AND r.ROLE_CODE IN ('AGENT', 'SUPERVISOR'))");
 
             if (!DataUtil.isNullOrEmpty(userName)) {
                 sqlStrBuilder.append(" AND UPPER(vu.USER_NAME) LIKE UPPER(:p_user_name)");

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

@@ -5,7 +5,6 @@ import com.viettel.campaign.model.acd_full.Agents;
 import com.viettel.campaign.model.ccms_full.*;
 import com.viettel.campaign.repository.acd_full.AgentsRepository;
 import com.viettel.campaign.repository.ccms_full.*;
-import com.viettel.campaign.service.CampaignCfgService;
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.utils.*;
 import com.viettel.campaign.web.dto.*;
@@ -504,24 +503,6 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         return result;
     }
 
-    @Override
-    public ResultDTO getCallStatus(CampaignRequestDTO dto) {
-        ResultDTO result = new ResultDTO();
-//        Random r = new Random();
-        String[] arr = {"ACCEPT", "REJECT", "MISSING"};
-
-        if (dto != null) {
-            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            result.setData(arr[this.rand.nextInt(arr.length)]);
-        } else {
-            result.setErrorCode(Constants.ApiErrorCode.ERROR);
-            result.setDescription(Constants.ApiErrorDesc.ERROR);
-        }
-
-        return result;
-    }
-
     @Override
     public ResultDTO getAgentLogout(CampaignRequestDTO dto) {
         ResultDTO result = new ResultDTO();
@@ -554,14 +535,19 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         try {
             if (dto.getEventCall().equalsIgnoreCase("call")) {
                 ccr = ccResultRepository.save(modelMapper.map(dto, ContactCustResult.class));
-            } else if (dto.getContactCustResultId() != null) {
+            }
+
+            if (dto.getContactCustResultId() != null) {
                 ccr = ccResultRepository.getOne(dto.getContactCustResultId());
+
                 if (dto.getEventCall().equalsIgnoreCase("ringing")) {
                     ccr.setCallId(dto.getCallId());
                     ccr.setUpdateBy(userSession.getUserId());
                     ccr.setUpdateTime(new Date());
                     ccr = ccResultRepository.save(ccr);
-                } else if (dto.getEventCall().equalsIgnoreCase("ended")) {
+                }
+
+                if (dto.getEventCall().equalsIgnoreCase("ended")) {
                     ccr.setDurationCall(dto.getDurationCall());
                     ccr.setStartCall(dto.getStartCall());
                     ccr.setReceiveTime(dto.getReceiveTime());
@@ -576,6 +562,19 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
                     ag.setSystemStatus("AVAILABLE");
                     ag = agentsRepository.save(ag);
                 }
+
+                if (dto.getEventCall().equalsIgnoreCase("endedBeforeTen")) {
+                    ccr.setStatus((short) 0);
+                    ccr.setUpdateBy(userSession.getUserId());
+                    ccr.setUpdateTime(new Date());
+                    ccr = ccResultRepository.save(ccr);
+                }
+            }
+
+            if (dto.getEventCall().equalsIgnoreCase("endedAfterTen")) {
+                ccr = modelMapper.map(dto, ContactCustResult.class);
+                ccr.setPreEndTime(ccResultRepository.getMaxCreateTime(dto.getCampaignId(), dto.getAgentId()));
+                ccr = ccResultRepository.save(ccr);
             }
 
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
@@ -763,15 +762,15 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO createListContacQuestResult(List<ContactQuestResultDTO> dtoList) {
+    public ResultDTO createListContactQuestResult(List<ContactQuestResultDTO> dtoList) {
         ResultDTO resultDTO = new ResultDTO();
         List<ContactQuestResult> lstContactQuestResult = new ArrayList<>();
 
-        for (ContactQuestResultDTO item : dtoList) {
-            lstContactQuestResult.add(modelMapper.map(item, ContactQuestResult.class));
-        }
-
         try {
+            for (ContactQuestResultDTO item : dtoList) {
+                lstContactQuestResult.add(modelMapper.map(item, ContactQuestResult.class));
+            }
+
             List<ContactQuestResult> dataReturn = new ArrayList<>();
             dataReturn = contactQuestResultRepository.saveAll(lstContactQuestResult);
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
@@ -785,6 +784,29 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         return resultDTO;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public ResultDTO updateListContactQuestResult(ContactQuestResultDTO dto) {
+        ResultDTO resultDTO = new ResultDTO();
+        List<ContactQuestResult> lstContactQuestResult = new ArrayList<>();
+
+        try {
+            lstContactQuestResult = contactQuestResultRepository.findByContactCustResultId(dto.getContactCustResultId());
+            for (ContactQuestResult item : lstContactQuestResult) {
+                item.setStatus((short) 0);
+            }
+            lstContactQuestResult = contactQuestResultRepository.saveAll(lstContactQuestResult);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setListData(lstContactQuestResult);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return resultDTO;
+    }
+
     @Override
     public String getDialModeAtCurrent(Long campaignId, Long companySiteId) {
         // 0: manual, 1- Preview, 2-Progressive, 3-Super Progressive, 4- Predictive
@@ -798,7 +820,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
                 return lstTimeZone.getDialMode().toString();
             }
         } catch (Exception e) {
-             e.printStackTrace();
+            e.printStackTrace();
         }
 
         return "-1";

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

@@ -392,14 +392,22 @@ public class CustomerServiceImpl implements CustomerService {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO deleteCustomer(CustomerRequestDTO customerRequestDTO) {
         ResultDTO resultDTO = new ResultDTO();
+        List<Long> listId = new ArrayList<>();
+        listId.add(customerRequestDTO.getCustomerId());
         try {
             if (customerRequestDTO != null) {
-                // delete
+
+                if (customerListMappingRepository.findAllCustomerListMapping(listId, customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId()).size() > 0) {
+                    // delete
 //                customerRepository.deleteById(customerDTO.getCustomerId());
-                customerListMappingRepository.deleteMappingByCustomerId(customerRequestDTO.getCustomerId(), customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId());
+                    customerListMappingRepository.deleteMappingByCustomerId(customerRequestDTO.getCustomerId(), customerRequestDTO.getCustomerListId(), customerRequestDTO.getCompanySiteId());
 
-                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                } else {
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+                }
             } else {
                 resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);

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

@@ -70,8 +70,6 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
         List<ScenarioAnswerDTO> lstAnswers = new ArrayList<>();
         List<ScenarioAnswer> lstAnswersToInsert = new ArrayList<>();
         try {
-            if(scenarioQuestionDTO.getQuestion() != null && scenarioQuestionDTO.getQuestion() != "")
-                scenarioQuestionDTO.setQuestion(scenarioQuestionDTO.getQuestion().trim());
             ScenarioQuestion scenarioQuestion = modelMapper.map(scenarioQuestionDTO, ScenarioQuestion.class);
 
             scenarioQuestion.setCreateTime(new Date());

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

@@ -247,14 +247,14 @@ public class ScenarioServiceImpl implements ScenarioService {
         } catch (Exception e) {
             logger.error(e.getMessage());
             return null;
-        } finally {
+        }finally {
             //if (workbook != null) workbook.close();
         }
     }
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public Map<String, Object> readAndValidateCustomer(String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException {
+    public Map<String, Object> readAndValidateCustomer (String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException{
         Locale locale = new Locale("vi", "VN");
         SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         Map<String, Object> result = new HashMap<>();
@@ -371,52 +371,18 @@ public class ScenarioServiceImpl implements ScenarioService {
                     if (rawDataList.get(i)[0] == null || !DataUtil.isNumber(rawDataList.get(i)[0].toString())) {
                         sb.append(BundleUtils.getLangString("scenario.questionCode.required"));
                     }
-                    //question type
                     if (rawDataList.get(i)[1] == null || rawDataList.get(i)[1].toString().trim().equals("")) {
                         sb.append(BundleUtils.getLangString("scenario.questionType.required"));
                     }
-                    if (rawDataList.get(i)[1] != null && !rawDataList.get(i)[1].toString().trim().equals("")) {
-                        if (rawDataList.get(i)[1].toString().trim().equals(BundleUtils.getLangString("scenario.template.singleChoice")) ||
-                                rawDataList.get(i)[1].toString().trim().equals(BundleUtils.getLangString("scenario.template.multiChoice")) ||
-                                rawDataList.get(i)[1].toString().trim().equals(BundleUtils.getLangString("scenario.template.text"))
-                        ) {
-                            sb = sb;
-                        } else {
-                            sb.append(BundleUtils.getLangString("scenario.questionType.invalid"));
-                        }
-                    }
-                    //
                     if (rawDataList.get(i)[2] == null || rawDataList.get(i)[2].toString().trim().equals("")) {
                         sb.append(BundleUtils.getLangString("scenario.question.required"));
                     }
-                    //required
                     if (rawDataList.get(i)[5] == null || rawDataList.get(i)[5].toString().trim().equals("")) {
                         sb.append(BundleUtils.getLangString("scenario.required.required"));
                     }
-                    if (rawDataList.get(i)[5] != null && !rawDataList.get(i)[5].toString().trim().equals("")) {
-                        if (rawDataList.get(i)[5].toString().trim().equals(BundleUtils.getLangString("scenario.template.yes")) ||
-                                rawDataList.get(i)[5].toString().trim().equals(BundleUtils.getLangString("scenario.template.no"))
-                        ) {
-                            sb = sb;
-                        } else {
-                            sb.append(BundleUtils.getLangString("scenario.required.invalid"));
-                        }
-                    }
-                    //
-                    //default
                     if (rawDataList.get(i)[6] == null || rawDataList.get(i)[6].toString().trim().equals("")) {
                         sb.append(BundleUtils.getLangString("scenario.default.required"));
                     }
-                    if (rawDataList.get(i)[6] != null && !rawDataList.get(i)[6].toString().trim().equals("")) {
-                        if (rawDataList.get(i)[6].toString().trim().equals(BundleUtils.getLangString("scenario.template.yes")) ||
-                                rawDataList.get(i)[6].toString().trim().equals(BundleUtils.getLangString("scenario.template.no"))
-                        ) {
-                            sb = sb;
-                        } else {
-                            sb.append(BundleUtils.getLangString("scenario.default.invalid"));
-                        }
-                    }
-                    //
                 }
 
                 //validate answer
@@ -426,20 +392,9 @@ public class ScenarioServiceImpl implements ScenarioService {
                     if ((rawDataList.get(i)[3] == null || rawDataList.get(i)[3].toString().trim().equals("")) && (!selectedType.equals(BundleUtils.getLangString("scenario.template.text")))) {
                         sb.append(BundleUtils.getLangString("scenario.answer.required"));
                     }
-                    //hash input
                     if (rawDataList.get(i)[4] == null && rawDataList.get(i)[4].toString().trim().equals("")) {
                         sb.append(BundleUtils.getLangString("scenario.hashInput.required"));
                     }
-                    if (rawDataList.get(i)[4] != null && !rawDataList.get(i)[4].toString().trim().equals("")) {
-                        if (rawDataList.get(i)[4].toString().trim().equals(BundleUtils.getLangString("scenario.template.yes")) ||
-                                rawDataList.get(i)[4].toString().trim().equals(BundleUtils.getLangString("scenario.template.no"))
-                        ) {
-                            sb = sb;
-                        } else {
-                            sb.append(BundleUtils.getLangString("scenario.hashInput.invalid"));
-                        }
-                    }
-                    //
                     if ((rawDataList.get(i)[7] != null && !rawDataList.get(i)[7].toString().trim().equals(""))) {
                         if ((rawDataList.get(i)[7].toString().trim().equals(tmpCurrentQuestionCode)) ||
                                 !validateMappingQuestion(rawDataList.get(i)[7].toString().trim(), tmpCurrentQuestionCode, lstImportQuestionCodes))
@@ -474,7 +429,7 @@ public class ScenarioServiceImpl implements ScenarioService {
                         ScenarioQuestion question = questionRepository.findScenarioQuestionByCodeAndCompanySiteId(item.getMappingQuestionCode(), item.getCompanySiteId());
                         if (question != null) {
                             ScenarioAnswer answerForUpdate = answerRepository.findScenarioAnswerByCode(item.getCode());
-                            if (answerForUpdate != null) {
+                            if(answerForUpdate != null) {
                                 answerForUpdate.setMappingQuestionId(question.getScenarioQuestionId());
                                 answerRepository.save(answerForUpdate);
                             }
@@ -499,13 +454,19 @@ public class ScenarioServiceImpl implements ScenarioService {
         } catch (Exception ex) {
             logger.info(ex.getMessage(), ex);
             result.put("message", BundleUtils.getLangString("customer.errorValidate", locale));
-        } finally {
+        }finally {
             if (workbook != null) workbook.close();
-            if (fis != null) fis.close();
+            if(fis != null) fis.close();
         }
         return result;
     }
 
+    @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
+    public List<ContactQuestResult> getContactQuestResult(Long companySiteId, Long campaignId, Long customerId) {
+        return questResultRepository.findByCompanySiteIdAndCampaignIdAndCustomerId(companySiteId, campaignId, customerId);
+    }
+
     private boolean validateMappingQuestion(String mappingQuestion, String currentQuestionCode, List<String> lstQuestionCode) {
         if (mappingQuestion != null && mappingQuestion.equals(currentQuestionCode)) return false;
 

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

@@ -52,6 +52,7 @@ public class ContactCustResultDTO extends BaseDTO {
     private String campaignCode;
     private String userName;
     private String surveyStatus;
+    private String connectStatus;
     private Boolean enableEdit;
 
     private Integer totalRow;

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

@@ -68,13 +68,6 @@ public class CampaignExecuteController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @PostMapping("/getCallStatus")
-    @ResponseBody
-    public ResponseEntity<ResultDTO> getCallStatus(@RequestBody CampaignRequestDTO requestDto) {
-        ResultDTO result = campaignExecuteService.getCallStatus(requestDto);
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
     @GetMapping("/countRecallCustomer")
     @ResponseBody
     public ResponseEntity countRecallCustomer(@RequestParam("companySiteId") Long companySiteId, @RequestParam("agentId") Long agentId) {
@@ -169,7 +162,15 @@ public class CampaignExecuteController {
     @ResponseBody
     public ResponseEntity<ResultDTO> createListContactQuestResult(@RequestBody List<ContactQuestResultDTO> dtoList) {
         ResultDTO result = null;
-        result = campaignExecuteService.createListContacQuestResult(dtoList);
+        result = campaignExecuteService.createListContactQuestResult(dtoList);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PutMapping("/updateListContactQuestResult")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> updateListContactQuestResult(@RequestBody ContactQuestResultDTO dto) {
+        ResultDTO result = null;
+        result = campaignExecuteService.updateListContactQuestResult(dto);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 

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

@@ -76,9 +76,9 @@ public class CustomerController {
     @PostMapping("/delete")
     @ResponseBody
     public ResultDTO deleteCustomer(@RequestBody @Valid CustomerRequestDTO customerRequestDTO) {
-        ResultDTO result = new ResultDTO();
-        result = customerService.deleteCustomer(customerRequestDTO);
-        return result;
+        ResultDTO resultDTO = new ResultDTO();
+        resultDTO = customerService.deleteCustomer(customerRequestDTO);
+        return resultDTO;
     }
 
     @PostMapping("/deleteIds")

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

 package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.model.ccms_full.ContactQuestResult;
 import com.viettel.campaign.model.ccms_full.Scenario;
 import com.viettel.campaign.service.ScenarioService;
 import com.viettel.campaign.utils.BundleUtils;
@@ -36,7 +37,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/ipcc/campaign/scenario")
-@CrossOrigin
+@CrossOrigin(origins = "*")
 public class ScenarioController {
 
     private static final Logger logger = LoggerFactory.getLogger(ScenarioController.class);
@@ -147,4 +148,9 @@ public class ScenarioController {
         return null;
     }
 
+    @RequestMapping(value = "/getContactQuestResult", method = RequestMethod.GET)
+    public List<ContactQuestResult> getContactQuestResult(@RequestParam Long companySiteId, @RequestParam Long campaignId, @RequestParam Long customerId) {
+        return scenarioService.getContactQuestResult(companySiteId, campaignId, customerId);
+    }
+
 }

src/main/resources/i18n/language_en.properties

@@ -138,8 +138,3 @@ scenario.mappingQuestion.invalid="Mapping question invalid"
 
 ok="Imported"
 error="Error"
-
-scenario.questionType.invalid="Question type invalid"
-scenario.required.invalid="Required field invalid"
-scenario.default.invalid="Default field invalid"
-scenario.hashInput.invalid="Has input field invalid"

src/main/resources/i18n/language_vi.properties

@@ -141,10 +141,6 @@ scenario.mappingQuestion.invalid="Câu hỏi liên kết không hợp lệ"
 ok="Thành công"
 error="Thất bại"
 
-scenario.questionType.invalid="Loại câu hỏi không hợp lệ"
-scenario.required.invalid="Giá trị rường bắt buộc không hợp lệ"
-scenario.default.invalid="Giá trị trường mặc định không hợp lệ"
-scenario.hashInput.invalid="Giá trị nhập text không hợp lệ"