hungtt-commit fix bug 362

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

@@ -912,7 +912,11 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append("         sum(case");
             sb.append("                 when status in (select * from status_customer) then 1");
             sb.append("                 else 0");
-            sb.append("             end) totalNotCall");
+            sb.append("             end) totalNotCall,");
+            sb.append("         sum(case");
+            sb.append("                 when customer_list_id is not null and in_campaign_status = 1 then 1");
+            sb.append("                 else 0");
+            sb.append("             end) totalCusInList");
             sb.append(" from campaign_customer");
             sb.append(" group by campaign_id");
             sb.append(" )");

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

@@ -76,7 +76,7 @@ public class ScenarioAnswerServiceImpl implements ScenarioAnswerService {
             Campaign campaign = campaignRepository.findByCampaignId(scenarioAnswerDTO.getCampaignId());
             if(campaign != null) {
                 if (campaign.getStatus() == 0L || campaign.getStatus() == 1L) {
-                    scenarioAnswerRepository.deleteById(scenarioAnswerDTO.scenarioAnswerId);
+                    scenarioAnswerRepository.deleteById(scenarioAnswerDTO.getScenarioAnswerId());
                     campaignLog = new CampaignLog();
                     campaignLog.setCompanySiteId(scenarioAnswerDTO.getCompanySiteId());
                     campaignLog.setCreateTime(new Date());

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

 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.*;
+import com.viettel.campaign.model.ccms_full.ContactQuestResult;
+import com.viettel.campaign.model.ccms_full.Scenario;
+import com.viettel.campaign.model.ccms_full.ScenarioAnswer;
+import com.viettel.campaign.model.ccms_full.ScenarioQuestion;
+import com.viettel.campaign.repository.ccms_full.ContactQuestResultRepository;
+import com.viettel.campaign.repository.ccms_full.ScenarioAnswerRepository;
+import com.viettel.campaign.repository.ccms_full.ScenarioQuestionRepository;
+import com.viettel.campaign.repository.ccms_full.ScenarioRepository;
 import com.viettel.campaign.service.ScenarioQuestionService;
 import com.viettel.campaign.service.ScenarioService;
 import com.viettel.campaign.utils.BundleUtils;
@@ -10,7 +16,6 @@ import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.utils.WorkBookBuilder;
 import com.viettel.campaign.web.dto.*;
-import com.viettel.econtact.filter.UserSession;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.ss.usermodel.*;
@@ -22,11 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.*;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -420,7 +424,7 @@ public class ScenarioServiceImpl implements ScenarioService {
                     if (item.getMappingQuestionCode() != null && item.getMappingQuestionId() == null) {
                         ScenarioQuestion question = questionRepository.findScenarioQuestionByCodeAndCompanySiteId(item.getMappingQuestionCode(), item.getCompanySiteId());
                         if (question != null) {
-                            ScenarioAnswer answerForUpdate = answerRepository.findScenarioAnswerByCode(item.code);
+                            ScenarioAnswer answerForUpdate = answerRepository.findScenarioAnswerByCode(item.getCode());
                             if(answerForUpdate != null) {
                                 answerForUpdate.setMappingQuestionId(question.getScenarioQuestionId());
                                 answerRepository.save(answerForUpdate);