Merge remote-tracking branch 'origin/master'

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

@@ -90,6 +90,6 @@ public interface CustomerService {
 ////    List<CustomizeFields> searchCustomize();
     ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields);
 
-    ResultDTO searchCustomizeFields(int page, int pageSize, long companySiteId, long campaignId, CustomerQueryDTO customerQueryDTO);
+    ResultDTO searchCustomizeFields(CampaignCustomerDTO campaignCustomerDTO);
 
 }

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

@@ -239,6 +239,8 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
             return resultDTO;
         }
         try {
+            scenarioQuestionDTO.setCode(scenarioQuestionDTO.getCode().trim());
+            scenarioQuestionDTO.setQuestion(scenarioQuestionDTO.getQuestion().trim());
             ScenarioQuestion scenarioQuestion = modelMapper.map(scenarioQuestionDTO, ScenarioQuestion.class);
 
             if (scenarioQuestion.getScenarioQuestionId() != null) {
@@ -271,6 +273,8 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
                         campaignLogAnswer.setCampaignId(scenarioQuestion.getCampaignId());
 
                         if (item.getScenarioAnswerId() != null) {
+                            item.setCode(item.getCode().trim());
+                            item.setAnswer(item.getAnswer().trim());
                             ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
                             scenarioAnswerRepository.save(answer);
                             campaignLogAnswer.setCustomerId(answer.getScenarioAnswerId());
@@ -281,6 +285,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
                             item.setScenarioQuestionId(scenarioQuestion.getScenarioQuestionId());
                             item.setCreateTime(new Date());
                             item.setStatus((short) 1);
+                            item.setAnswer(item.getAnswer().trim());
                             ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
                             scenarioAnswerRepository.save(answer);
                             campaignLogAnswer.setCustomerId(answer.getScenarioAnswerId());

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

@@ -72,6 +72,9 @@ public class ScenarioServiceImpl implements ScenarioService {
     public ResultDTO update(ScenarioDTO scenarioDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {
+            scenarioDTO.setCode(scenarioDTO.getCode().trim());
+            if (scenarioDTO.getDescription() != null) scenarioDTO.setDescription(scenarioDTO.getDescription().trim());
+            else scenarioDTO.setDescription("");
             scenarioDTO.setUpdateBy(null);
             scenarioDTO.setUpdateTime(new Date());
 
@@ -368,8 +371,8 @@ public class ScenarioServiceImpl implements ScenarioService {
                     if (rawDataList.get(i)[4] == null && rawDataList.get(i)[4].toString().trim().equals("")) {
                         sb.append(BundleUtils.getLangString("scenario.hashInput.required"));
                     }
-                    if((rawDataList.get(i)[7] != null && !rawDataList.get(i)[7].toString().trim().equals(""))) {
-                        if((rawDataList.get(i)[7].toString().trim().equals(tmpCurrentQuestionCode)) ||
+                    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))
                             sb.append(BundleUtils.getLangString("scenario.mappingQuestion.invalid"));
                     }
@@ -415,12 +418,12 @@ public class ScenarioServiceImpl implements ScenarioService {
     }
 
     private boolean validateMappingQuestion(String mappingQuestion, String currentQuestionCode, List<String> lstQuestionCode) {
-        if(mappingQuestion == currentQuestionCode) return false;
+        if (mappingQuestion == currentQuestionCode) return false;
 
         String duplicateCode = lstQuestionCode.stream().
                 filter(p -> (p.equals(mappingQuestion) && p.equals(currentQuestionCode))).
                 findAny().orElse(null);
-        if(duplicateCode == null) return false;
+        if (duplicateCode == null) return false;
 
 //        String notMappedCode = lstQuestionCode.stream().filter(p -> (!p.equals(mappingQuestion))).findAny().orElse(null);
 //        if(notMappedCode != null) return false;

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

 package com.viettel.campaign.web.dto;
 
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -27,4 +29,7 @@ public class CampaignCustomerDTO extends BaseDTO{
     private Long companySiteId;
     private Long complainId;
     private String lstCustomerId;
+    private List<CustomerQueryDTO>  listQuery;
+
+
 }

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

 package com.viettel.campaign.web.dto;
 
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -29,4 +31,5 @@ public class CustomizeFieldsDTO extends BaseDTO {
     private Long min;
     private Long max;
     private Long active;
+
 }

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

@@ -11,4 +11,5 @@ public class CustomerQueryDTO extends BaseDTO {
     String field;
     String operator;
     String condition;
+
 }

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

@@ -12,6 +12,7 @@ import com.viettel.campaign.utils.Config;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
@@ -322,4 +323,13 @@ public class CustomerController {
         ResultDTO resultDTO = customerService.listCustomizeFields(customizeRequestDTo);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
+
+    @PostMapping("/searchCustomizeFields")
+    @ResponseBody
+    public ResponseEntity searchCustomizeFields(@RequestBody CampaignCustomerDTO campaignCustomerDTO ) {
+        ResultDTO result = customerService.searchCustomizeFields(campaignCustomerDTO);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+
 }