no message

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

@@ -223,10 +223,10 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 total = list.get(0).getTotalRow();
             }
             for (ContactCusResDTO contactCusResDTO : list) {
-                if (!"AGENT".equals(dto.getRoleUser())) {
+                if (!"AGENT".equals(dto.getRoleUser())) { // ko phải nhân viên
                     contactCusResDTO.setEnableEdit(true);
                 } else {
-                    if ("2".equals(contactCusResDTO.getRecordStatus())) {
+                    if ("2".equals(contactCusResDTO.getRecordStatus())) {// là nhân viên thường
                         contactCusResDTO.setEnableEdit(true);
                     } else if ("1".equals(contactCusResDTO.getRecordStatus()) && isLower24Hour(contactCusResDTO.getCreateTime())) {
                         contactCusResDTO.setEnableEdit(true);

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

@@ -726,8 +726,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append(" where a.status = 1");
             sb.append("     and (:p_cus_list_code is null or upper(a.customer_list_code) like '%'||:p_cus_list_code||'%')");
             sb.append("     and (:p_cus_list_name is null or upper(a.customer_list_name) like '%'||:p_cus_list_name||'%')");
-            sb.append("     and (a.create_at <= to_date(:p_to_date, 'DD/MM/YYYY'))");
-            sb.append("     and (a.create_at >= to_date(:p_from_date, 'DD/MM/YYYY'))");
+            sb.append("     and (:p_to_date is null or (a.create_at <= to_date(:p_to_date, 'DD/MM/YYYY')))");
+            sb.append("     and (:p_from_date is null or (a.create_at >= to_date(:p_from_date, 'DD/MM/YYYY')))");
             sb.append("     and (a.company_site_id = :p_company_site_id)");
             sb.append("     and (a.customer_list_id not in (select CUSTOMER_LIST_ID from campaign_customer_id))");
             sb.append(" ),");
@@ -739,23 +739,13 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append(" )");
             sb.append(" select a.customerListId, a.customerListCode, a.customerListName, a.totalCusList, a.totalCusActive, a.totalCusLock, a.totalCusDnc, totalRow from data a, count_data");
             sb.append(" where row_ >= ((:p_page_number - 1) * :p_page_size + 1) and row_ < (:p_page_number * :p_page_size + 1)");
-//            params.put("p_campaign_id", dto.getCampaignId());
-//            params.put("p_cus_list_code", DataUtil.isNullOrEmpty(dto.getCustListCode()) ? null : dto.getCustListCode().toUpperCase());
-//            params.put("p_cus_list_name", DataUtil.isNullOrEmpty(dto.getCustListName()) ? null : dto.getCustListName().toUpperCase());
-//            params.put("p_to_date", dto.getCreateTimeTo());
-//            params.put("p_from_date", dto.getCreateTimeFr());
-//            params.put("p_company_site_id", dto.getCompanySiteId());
-//            params.put("p_page_number", dto.getPage().toString());
-//            params.put("p_page_size", dto.getPageSize().toString());
-//
-//            list = namedParameterJdbcTemplate.query(sb.toString(), params, BeanPropertyRowMapper.newInstance(CustomerListDTO.class));
             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().toUpperCase());
             query.setParameter("p_cus_list_name", DataUtil.isNullOrEmpty(dto.getCustListName()) ? null : dto.getCustListName().toUpperCase());
-            query.setParameter("p_to_date", dto.getCreateTimeTo());
-            query.setParameter("p_from_date", dto.getCreateTimeFr());
+            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_page_number", dto.getPage());
             query.setParameter("p_page_size", dto.getPageSize());