damdt accept merge

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

@@ -613,12 +613,14 @@ public class CustomerServiceImpl implements CustomerService {
         String convertDate = dateFormat.format(new Date());
         String[] dateArray = convertDate.split("/");
 
-        if (newDay == 0) {
-            apParamRepository.updateCustomerListSeq(String.valueOf(Integer.parseInt(apParam.getParValue()) + 1), apParam.getDescription());
-            customerListDTO.setCustomerListCode(dateArray[0] + dateArray[2] + dateArray[1] + "_" + (Integer.parseInt(apParam.getParValue()) + 1) + " " + customerListDTO.getCustomerListCode());
-        } else {
-            apParamRepository.updateCustomerListSeq("1", dateFormat.format(new Date()));
-            customerListDTO.setCustomerListCode(dateArray[0] + dateArray[2] + dateArray[1] + "_1" + " " + customerListDTO.getCustomerListCode());
+        if (customerListDTO.getCustomerListCode().trim().length() == 0) {
+            if (newDay == 0) {
+                apParamRepository.updateCustomerListSeq(String.valueOf(Integer.parseInt(apParam.getParValue()) + 1), apParam.getDescription());
+                customerListDTO.setCustomerListCode(dateArray[0]+dateArray[2]+dateArray[1]+"_"+(Integer.parseInt(apParam.getParValue()) + 1));
+            } else {
+                apParamRepository.updateCustomerListSeq("1", dateFormat.format(new Date()));
+                customerListDTO.setCustomerListCode(dateArray[0]+dateArray[2]+dateArray[1]+"_1");
+            }
         }
 
         // THÍM NÀO MERGE CONFLICT THÌ GIỮ LẠI HỘ E CÁI METHOD NÀY VỚI
@@ -794,13 +796,13 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append("  AND a.STATUS = 1");
             sb.append("  AND a.COMPANY_SITE_ID = :p_company_site_id");
 
-            sb.append(" AND CREATE_AT BETWEEN to_date(:p_date_from, 'YYYYMMDD') AND to_date(:p_date_to, 'YYYYMMDD')");
+            sb.append(" AND to_date(CREATE_AT, 'DD-MM-RR') >= to_date(:p_date_from, 'YYYYMMDD') AND to_date(CREATE_AT, 'DD-MM-RR') <= to_date(:p_date_to, 'YYYYMMDD')");
 
             if (!DataUtil.isNullOrEmpty(searchCustomerRequestDTO.getCustomerListCode())) {
-                sb.append(" AND CUSTOMER_LIST_CODE LIKE :p_list_code");
+                sb.append(" AND UPPER(CUSTOMER_LIST_CODE) LIKE UPPER(:p_list_code)");
             }
             if (!DataUtil.isNullOrEmpty(searchCustomerRequestDTO.getCustomerListName())) {
-                sb.append(" AND CUSTOMER_LIST_NAME LIKE :p_list_name");
+                sb.append(" AND UPPER(CUSTOMER_LIST_NAME) LIKE UPPER(:p_list_name)");
             }
 
             sb.append(" ORDER BY CREATE_AT DESC");
@@ -813,7 +815,7 @@ public class CustomerServiceImpl implements CustomerService {
 
             if (!DataUtil.isNullOrEmpty(searchCustomerRequestDTO.getCustomerListCode())) {
                 query.setParameter("p_list_code", "%" +
-                        searchCustomerRequestDTO.getCustomerListCode()
+                        searchCustomerRequestDTO.getCustomerListCode().trim()
                                 .replace("\\", "\\\\")
                                 .replaceAll("%", "\\%")
                                 .replaceAll("_", "\\_")
@@ -822,7 +824,7 @@ public class CustomerServiceImpl implements CustomerService {
 
             if (!DataUtil.isNullOrEmpty(searchCustomerRequestDTO.getCustomerListName())) {
                 query.setParameter("p_list_name", "%" +
-                        searchCustomerRequestDTO.getCustomerListName()
+                        searchCustomerRequestDTO.getCustomerListName().trim()
                                 .replace("\\", "\\\\")
                                 .replaceAll("%", "\\%")
                                 .replaceAll("_", "\\_")

src/main/resources/application.yml

 server:
-  port: 1111
+  port: 9999
 spring:
   application:
     name: campaign