Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

src/main/java/com/viettel/campaign/repository/ccms_full/CustomizeFieldsRepository.java

 package com.viettel.campaign.repository.ccms_full;
 
+import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @Repository
+@Transactional(DataSourceQualify.CCMS_FULL)
 public interface CustomizeFieldsRepository extends JpaRepository<CustomizeFields, Long> {
+
     List<CustomizeFields> findCustomizeFieldsByFunctionCodeEqualsAndStatusAndActiveAndSiteId(String functionCode, Long status, Long active, Long siteId);
+
+    List<CustomizeFields> findByFunctionCodeAndActiveAndStatusAndSiteId(String functionCode, Long active, Long status, Long siteId);
 }

src/main/java/com/viettel/campaign/service/CustomerService.java

@@ -67,6 +67,7 @@ public interface CustomerService {
     ResultDTO getCustomerRecall(Long campaignId, Long customerId);
 
     List<Customer> findAllByCondition(Long siteId, Date endTime);
+
     Customer update(Customer c);
 
     List<CustomizeFields> getDynamicHeader(Long companySiteId);
@@ -76,10 +77,15 @@ public interface CustomerService {
     Map<String, Object> readAndValidateCustomer(String path, List<CustomizeFields> headerDTOS, UserSession userSession, Long customerListId);
 
     List<CustomizeFieldObject> getCustomizeField(Long customerId);
+
     List<Customer> searchByQuery(String queryString);
+
     Long countByQuery(String queryString);
-//    Map<String, CustomizeRequestDTo>  searchCustomer();
+
+    //    Map<String, CustomizeRequestDTo>  searchCustomer();
 ////    List<CustomizeFields> searchCustomize();
-    ResultDTO listCustomizeFields(CustomizeRequestDTo customizeFields);
-    ResultDTO searchCustomizeFields(int page, int pageSize, long companySiteId,long campaignId,CustomerQueryDTO customerQueryDTO );
+    ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields);
+
+    ResultDTO searchCustomizeFields(int page, int pageSize, long companySiteId, long campaignId, CustomerQueryDTO customerQueryDTO);
+
 }

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

@@ -44,6 +44,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.nio.file.Files;
+import java.io.FileOutputStream;
+import java.lang.reflect.Array;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -612,10 +614,10 @@ public class CustomerServiceImpl implements CustomerService {
         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));
+                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");
+                customerListDTO.setCustomerListCode(dateArray[0] + dateArray[2] + dateArray[1] + "_1");
             }
         }
 
@@ -1643,12 +1645,12 @@ public class CustomerServiceImpl implements CustomerService {
         String[] lstCusId = campaignCustomerDTO.getLstCustomerId().split(",");
         List<Short> lstStatus = campaignCustomerRepository.getStatus();
         try {
-            for (String cusId: lstCusId) {
+            for (String cusId : lstCusId) {
                 CampaignCustomer entity = campaignCustomerRepository.findCampaignCustomerByCampaignIdAndCompanySiteIdAndCustomerId(campaignId, companySiteId, Long.parseLong(cusId));
                 if (entity.getStatus() == 0) {
                     campaignCustomerRepository.delete(entity);
-                } else if (lstStatus.contains(entity.getStatus())){
-                    entity.setInCampaignStatus((short)0);
+                } else if (lstStatus.contains(entity.getStatus())) {
+                    entity.setInCampaignStatus((short) 0);
                     campaignCustomerRepository.save(entity);
                 }
             }
@@ -1734,34 +1736,57 @@ public class CustomerServiceImpl implements CustomerService {
 //        sb.append("");
 //        sb.append("");
     @Override
-    public ResultDTO listCustomizeFields(CustomizeRequestDTo customizeFields) {
+    public ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields) {
         ResultDTO resultDTO = new ResultDTO();
         Map<String, String> params = new HashMap<>();
         List<CustomizeFielObjectDTO> list;
         StringBuilder stringBuilder = new StringBuilder();
         try {
+            List<CustomizeFields> lstCustomizeFields = customizeFieldsRepository.findByFunctionCodeAndActiveAndStatusAndSiteId(customizeFields.getFunctionCode(), customizeFields.getActive(), customizeFields.getStatus(), customizeFields.getSiteId());
+            String cf[][] = {
+                    {"-1", "Mã Khách Hàng", "number"},
+                    {"-2", "Tên khách hàng", "text"},
+                    {"-3", "Tên công ty", "text"},
+                    {"-4", "Giới tính", "number"},
+                    {"-5", "Địa chỉ", "text"},
+                    {"-6", "Nơi sinh", "text"},
+                    {"-7", "Ngày sinh", "date"},
+                    {"-8", "Số điện thoại", "number"},
+                    {"-9", "email", "text"},
+                    {"-10", "Tên đăng nhập", "text"},
+                    {"-11", "Loại Khách hàng", "number"},
+            };
+            for (int x = 0; x < 11; x++) {
+                CustomizeFields datafill = new CustomizeFields();
+                datafill.setCustomizeFieldId(Long.parseLong(cf[x][0]));
+                datafill.setTitle(cf[x][1]);
+                datafill.setType(cf[x][2]);
+                lstCustomizeFields.add(datafill);
+            }
+
+//        try {
 //            stringBuilder.append(" with column_name_temp as (");
-//            stringBuilder.append("    select 'CUSTOMER_ID'  ,1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("    select 'CUSTOMER_ID customerId'  , from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("    select 'CUSTOMER_NAME' ,1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("    select 'CUSTOMER_NAME customerName' , from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'CUSTOMER_TYPE'  ,1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'CUSTOMER_TYPE customerType'  , from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'NAME'   ,1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'NAME name'   , from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'CURRENT_ADDRESS', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'CURRENT_ADDRESS currentAddress',  from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'PLACE_OF_BIRTH', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'PLACE_OF_BIRTH placeOfBirth',  from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'DATE_OF_BIRTH', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'DATE_OF_BIRTH dateOfBirth',  from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'MOBILE_NUMBER', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'MOBILE_NUMBER mobileNumber',  from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'EMAIL', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'EMAIL email',  from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'USERNAME', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'USERNAME username',  from user_tab_columns, dual");
 //            stringBuilder.append(" union all");
-//            stringBuilder.append("     select 'CUSTOMER_TYPE', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     select 'CUSTOMER_TYPE customerType',  from user_tab_columns, dual");
 //            stringBuilder.append("     where table_name = 'CUSTOMER'");
 //            stringBuilder.append(" )");
 //
@@ -1773,54 +1798,25 @@ public class CustomerServiceImpl implements CustomerService {
 //            stringBuilder.append("     and site_id = :p_company_site_id");
 //            stringBuilder.append("     and STATUS = 1");
 //            stringBuilder.append("   and active = 1 ");
-            stringBuilder.append("SELECT C.NAME name," +
-                    "       C.CUSTOMER_ID customerID," +
-                    "       C.CURRENT_ADDRESS currentAddress," +
-                    "       C.USERNAME username," +
-                    "       C.GENDER gender," +
-                    "       C.COMPANY_NAME companyName," +
-                    "       C.DATE_OF_BIRTH dateOfBirth," +
-                    "       C.COMPANY_NAME companyName," +
-                    "       C.CUSTOMER_TYPE customerType," +
-                    "       C.PLACE_OF_BIRTH placeOfBirth," +
-                    "       C.CUSTOMER_TYPE customerType," +
-                    "       C.EMAIL email," +
-                    "       C.USERNAME username," +
-                    "       C.NAME name," +
-                    "       C.MOBILE_NUMBER mobileNumber," +
-                    "       C.SITE_ID siteId," +
-                    "       C.STATUS status," +
-                    "       CF.FUNCTION_CODE functionCode," +
-                    "       CF.ACTIVE active," +
-                    "       CFO.*");
-            stringBuilder.append("FROM CUSTOMER C");
-            stringBuilder.append("  INNER JOIN CUSTOMIZE_FIELD_OBJECT CFO ON C.CUSTOMER_ID = CFO.OBJECT_ID");
-            stringBuilder.append("   INNER JOIN CUSTOMIZE_FIELDS CF ON CF.CUSTOMIZE_FIELD_ID = CFO.CUSTOMIZE_FIELDS_ID\n" +
-                    "WHERE 1 = 1");
-//            stringBuilder.append("     and C.SITE_ID = :p_company_site_id");
-            stringBuilder.append("     and CF.STATUS = 1");
-            stringBuilder.append("   and active = 1 ");
-            stringBuilder.append("  and  CF.FUNCTION_CODE = 'CUSTOMER' ");
-            params.put("p_company_site_id", customizeFields.getSiteId());
-            params.put("p_customer_id", customizeFields.getCustomerId());
-            LOGGER.info("SQL statement: " + stringBuilder);
-            list = namedParameterJdbcTemplate.query(stringBuilder.toString(), params, BeanPropertyRowMapper.newInstance(CustomizeFielObjectDTO.class));
+//            params.put("p_company_site_id", customizeFields.getSiteId());
+//            params.put("p_customer_id", customizeFields.getCustomerId());
+//            LOGGER.info("SQL statement: " + stringBuilder);
+//            list = namedParameterJdbcTemplate.query(stringBuilder.toString(), params, BeanPropertyRowMapper.newInstance(CustomizeFielObjectDTO.class));
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            resultDTO.setListData(list);
+            resultDTO.setListData(lstCustomizeFields);
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         }
-        return resultDTO;
 
+        return resultDTO;
     }
 
 
-
     @Override
-    public ResultDTO searchCustomizeFields(int page, int pageSize, long SiteId ,long campaignId, CustomerQueryDTO customerQueryDTO) {
+    public ResultDTO searchCustomizeFields(int page, int pageSize, long SiteId, long campaignId, CustomerQueryDTO customerQueryDTO) {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
@@ -1866,14 +1862,13 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append("   and active = 1 ");
             sb.append("  and  CF.FUNCTION_CODE = 'CUSTOMER' ");
             List<CustomerQueryDTO> queryCustomer = new ArrayList<>();
-            for (int i = 0; i <queryCustomer.size() ; i++) {
+            for (int i = 0; i < queryCustomer.size(); i++) {
 
-                sb.append(queryCustomer.get(i).getJoin() + " "+
-                        queryCustomer.get(i).getOperator() + " "+ queryCustomer.get(i).getField() + " "+ queryCustomer.get(i).getCondition());
+                sb.append(queryCustomer.get(i).getJoin() + " " +
+                        queryCustomer.get(i).getOperator() + " " + queryCustomer.get(i).getField() + " " + queryCustomer.get(i).getCondition());
             }
 
 
-
             SQLQuery query = session.createSQLQuery(sb.toString());
 
 //            query.setParameter("p_company_site_id", companySiteId);
@@ -1904,9 +1899,8 @@ public class CustomerServiceImpl implements CustomerService {
 //            }
 
             query.addScalar("customerID", new LongType());
-            query.addScalar("name", new LongType());
-            query.addScalar("username", new LongType());
-            query.addScalar("customerId", new LongType());
+            query.addScalar("name", new StringType());
+            query.addScalar("username", new StringType());
             query.addScalar("name", new StringType());
             query.addScalar("description", new StringType());
             query.addScalar("companyName", new StringType());
@@ -1943,4 +1937,6 @@ public class CustomerServiceImpl implements CustomerService {
         return resultDTO;
 
     }
-    }
+
+
+}

src/main/java/com/viettel/campaign/web/dto/CustomizeFieldsDTO.java

+package com.viettel.campaign.web.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class CustomizeFieldsDTO extends BaseDTO {
+    private Long customizeFieldId;
+    private Long siteId;
+    private String functionCode;
+    private String createBy;
+    private Date createDate;
+    private String updateBy;
+    private Date updateDate;
+    private Long status;
+    private String type;
+    private String title;
+    private String placeholder;
+    private String description;
+    private Long position;
+    private Long required;
+    private Long fieldOptionsId;
+    private String regexpForValidation;
+    private Long maxLength;
+    private Long minLength;
+    private Long min;
+    private Long max;
+    private Long active;
+}

src/main/java/com/viettel/campaign/web/rest/CustomerController.java

@@ -289,7 +289,7 @@ public class CustomerController {
     }
     @PostMapping("/getCustomizeFields")
     @ResponseBody
-    public ResponseEntity<?> getListFieldsToShow(@RequestBody CustomizeRequestDTo customizeRequestDTo) {
+    public ResponseEntity<?> getListCustomer(@RequestBody CustomizeFieldsDTO customizeRequestDTo) {
         ResultDTO resultDTO = customerService.listCustomizeFields(customizeRequestDTo);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }