Merge branch 'master' of http://git.myitsol.com/hanv/service-campaign

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

@@ -754,10 +754,10 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             SQLQuery query = session.createSQLQuery(sb.toString());
             query.setParameter("p_company_site_id", dto.getCompanySiteId());
             query.setParameter("p_campaign_id", dto.getCampaignId());
-            query.setParameter("p_cus_list_code", DataUtil.isNullOrEmpty(dto.getCustListCode()) ? null : dto.getCustListCode().trim().toUpperCase());
-            query.setParameter("p_cus_list_name", DataUtil.isNullOrEmpty(dto.getCustListName()) ? null : dto.getCustListName().trim().toUpperCase());
-            query.setParameter("p_to_date", DataUtil.isNullOrEmpty(dto.getCustListCode()) ? null : dto.getCreateTimeTo());
-            query.setParameter("p_from_date", DataUtil.isNullOrEmpty(dto.getCustListCode()) ? null : dto.getCreateTimeFr());
+            query.setParameter("p_cus_list_code", DataUtil.isNullOrEmpty(dto.getCustListCode()) ? null : dto.getCustListCode().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_").toUpperCase());
+            query.setParameter("p_cus_list_name", DataUtil.isNullOrEmpty(dto.getCustListName()) ? null : dto.getCustListName().trim().replace("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_").toUpperCase());
+            query.setParameter("p_to_date", DataUtil.isNullOrEmpty(dto.getCreateTimeTo()) ? null : dto.getCreateTimeTo());
+            query.setParameter("p_from_date", DataUtil.isNullOrEmpty(dto.getCreateTimeFr()) ? null : dto.getCreateTimeFr());
             query.setParameter("p_page_number", dto.getPage());
             query.setParameter("p_page_size", dto.getPageSize());
 

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

@@ -1860,7 +1860,7 @@ public class CustomerServiceImpl implements CustomerService {
                     {"-5", "Địa chỉ", "text"},
                     {"-6", "Nơi sinh", "text"},
                     {"-7", "Ngày sinh", "date"},
-                    {"-8", "Số điện thoại", "text"},
+                    {"-8", "Số điện thoại", "number"},
                     {"-9", "email", "text"},
                     {"-10", "Tên đăng nhập", "text"},
                     {"-11", "Loại Khách hàng", "combobox"},

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

@@ -267,7 +267,6 @@ public class ScenarioServiceImpl implements ScenarioService {
             File file = new File(path);
             FileInputStream fis = new FileInputStream(file);
             workbook = new XSSFWorkbook(fis);
-            workbook = new XSSFWorkbook(fis);
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             Sheet sheet = workbook.getSheetAt(0);
             Row row = sheet.getRow(2);
@@ -449,7 +448,7 @@ public class ScenarioServiceImpl implements ScenarioService {
             result.put("message", BundleUtils.getLangString("customer.errorValidate", locale));
         }finally {
             if (workbook != null) workbook.close();
-            result.put("code", Constants.FILE_UPLOAD_RESP_CODE.ERROR);
+            //result.put("code", Constants.FILE_UPLOAD_RESP_CODE.ERROR);
         }
         return result;
     }