Skip to content

S
service-campaign
Commit 6c12fe26 authored by Đào Nhật Quang's avatar Đào Nhật Quang
Browse files
Options

quangdn - fix bug

parent 837fb275
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 19 deletions
src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
View file @ 6c12fe26
...@@ -953,6 +953,7 @@ public class CustomerServiceImpl implements CustomerService { ...@@ -953,6 +953,7 @@ public class CustomerServiceImpl implements CustomerService {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
int failedCount = 0; int failedCount = 0;
XSSFWorkbook workbook = null; XSSFWorkbook workbook = null;
boolean isMainPhoneNull = false, isSecondPhoneNull = false, isEmailNull = false;
try { try {
//<editor-fold desc="Khởi tạo mảng header tĩnh" defaultstate="collapsed"> //<editor-fold desc="Khởi tạo mảng header tĩnh" defaultstate="collapsed">
...@@ -1053,34 +1054,35 @@ public class CustomerServiceImpl implements CustomerService { ...@@ -1053,34 +1054,35 @@ public class CustomerServiceImpl implements CustomerService {
sb.append(str); sb.append(str);
} }
} else sb.append(BundleUtils.getLangString("customer.nameRequired", locale)); } else sb.append(BundleUtils.getLangString("customer.nameRequired", locale));
if (rawDataList.get(i).length > 4 if (rawDataList.get(i).length > 4 && (rawDataList.get(i)[2] == null || rawDataList.get(i)[2].toString().trim().equals(""))) {
&& rawDataList.get(i)[2] != null isMainPhoneNull = true;
&& !rawDataList.get(i)[2].toString().trim().equals("") } else {
&& rawDataList.get(i)[3] != null
&& !rawDataList.get(i)[3].toString().trim().equals("")
&& rawDataList.get(i)[4] != null
&& !rawDataList.get(i)[4].toString().trim().equals("")) {
String str = "";
if (validateNumberOnly(rawDataList.get(i)[2].toString().trim())) { if (validateNumberOnly(rawDataList.get(i)[2].toString().trim())) {
str = validateExistPhone(rawDataList.get(i)[2].toString().trim(), locale); sb.append(validateExistPhone(rawDataList.get(i)[2].toString().trim(), locale));
} else { } else {
str += BundleUtils.getLangString("customer.onlyNumber", locale); sb.append(BundleUtils.getLangString("customer.onlyNumber", locale));
} }
}
if (rawDataList.get(i).length > 4 && (rawDataList.get(i)[3] == null || rawDataList.get(i)[3].toString().trim().equals(""))) {
isSecondPhoneNull = true;
} else {
if (validateNumberOnly(rawDataList.get(i)[3].toString().trim())) { if (validateNumberOnly(rawDataList.get(i)[3].toString().trim())) {
str += (validateLength(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0], rawDataList.get(i)[3].toString(), 50, locale)); sb.append(validateLength(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0], rawDataList.get(i)[3].toString(), 50, locale));
} else { } else {
str += BundleUtils.getLangString("customer.onlyNumber", locale); sb.append(BundleUtils.getLangString("customer.onlyNumber", locale));
} }
}
if (rawDataList.get(i).length > 4 && (rawDataList.get(i)[4] == null || rawDataList.get(i)[4].toString().trim().equals(""))) {
isEmailNull = true;
} else {
if (!validateEmail(rawDataList.get(i)[4].toString().trim())) { if (!validateEmail(rawDataList.get(i)[4].toString().trim())) {
str += (BundleUtils.getLangString("customer.emailInvalid", locale)); sb.append(BundleUtils.getLangString("customer.emailInvalid", locale));
} else { } else {
if (validateLength(BundleUtils.getLangString("customer.email", locale).split("#")[0], rawDataList.get(i)[4].toString(), 100, locale).equals("")) { sb.append(validateDuplicateEmail(rawDataList.get(i)[4].toString().trim(), locale));
str += (validateDuplicateEmail(rawDataList.get(i)[4].toString().trim(), locale)); sb.append(validateLength(BundleUtils.getLangString("customer.email", locale).split("#")[0], rawDataList.get(i)[4].toString(), 50, locale));
} else
str += validateLength(BundleUtils.getLangString("customer.email", locale).split("#")[0], rawDataList.get(i)[4].toString(), 50, locale);
} }
sb.append(str); }
} else { if (isEmailNull && isMainPhoneNull && isSecondPhoneNull) {
sb.append(BundleUtils.getLangString("customer.invalidRecord", locale)); sb.append(BundleUtils.getLangString("customer.invalidRecord", locale));
} }
if (rawDataList.get(i).length > 5 && rawDataList.get(i)[5] != null) { if (rawDataList.get(i).length > 5 && rawDataList.get(i)[5] != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment