anhvd commit fix bug

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

@@ -243,16 +243,16 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 }
                 List<CampaignDTO> data = query.list();
                 data.forEach(item -> {
-                    item.setStartTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getStartTime(),tzClient)));
-                    item.setEndTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getEndTime(),tzClient)));
+                    if(item.getStartTime() != null) item.setStartTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getStartTime(),tzClient)));
+                    if(item.getEndTime() != null) item.setEndTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getEndTime(),tzClient)));
                 });
                 Page<CampaignDTO> dataPage = new PageImpl<>(data, pageable, count);
                 result.setData(dataPage);
             } else {
                 List<CampaignDTO> dataExport = query.list();
                 dataExport.forEach(item -> {
-                    item.setStartTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getStartTime(),tzClient)));
-                    item.setEndTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getEndTime(),tzClient)));
+                    if(item.getStartTime() != null) item.setStartTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getStartTime(),tzClient)));
+                    if(item.getEndTime() != null) item.setEndTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getEndTime(),tzClient)));
                 });
                 result.setData(dataExport);
             }

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

@@ -4,12 +4,10 @@ import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.*;
 import com.viettel.campaign.repository.ccms_full.*;
 import com.viettel.campaign.service.CampaignService;
-import com.viettel.campaign.utils.BundleUtils;
-import com.viettel.campaign.utils.Constants;
-import com.viettel.campaign.utils.DataUtil;
-import com.viettel.campaign.utils.WorkBookBuilder;
+import com.viettel.campaign.utils.*;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -275,6 +273,8 @@ public class CampaignServiceImpl implements CampaignService {
         CellStyle styleRowHeader = WorkBookBuilder.buildDefaultStyleRowHeader(workbook);
         CellStyle styleRow = WorkBookBuilder.buildDefaultStyleRow(workbook);
 
+        styleRowHeader.setWrapText(true);
+        styleRow.setWrapText(true);
         // list header
         List<String> fileHeaderList = new ArrayList<>();
         fileHeaderList.add(BundleUtils.getLangString("stt", locale));
@@ -294,12 +294,12 @@ public class CampaignServiceImpl implements CampaignService {
         //
         String sheetName = BundleUtils.getLangString("campaign", locale);
         sheet = workbook.createSheet(sheetName);
-
         // Title
         String title = BundleUtils.getLangString("campaign.title", locale);
         int rowTitleStart = 3;
         Row rowTitle = sheet.createRow(rowTitleStart);
         rowTitle.setHeight((short) 800);
+
         WorkBookBuilder.writeCellContent(rowTitle, styleTitle, 3, title);
         sheet.addMergedRegion(new CellRangeAddress(rowTitleStart, rowTitleStart, 3, 8));
 
@@ -308,6 +308,7 @@ public class CampaignServiceImpl implements CampaignService {
         int count = 1;
         Row rowHeader = sheet.createRow(startRowTable);
         for (int i = 0; i < fileHeaderList.size(); i++) {
+            sheet.setColumnWidth(i, 6500);
             WorkBookBuilder.writeCellContent(rowHeader, styleRowHeader, i, fileHeaderList.get(i));
         }
         // Content
@@ -319,8 +320,8 @@ public class CampaignServiceImpl implements CampaignService {
             WorkBookBuilder.writeCellContent(row, styleRow, col++, listData.get(i).getCampaignName());
             WorkBookBuilder.writeCellContent(row, styleRow, col++, getCampaignTypeName(lstType, listData.get(i).getCampaignType()));
             WorkBookBuilder.writeCellContent(row, styleRow, col++, DataUtil.isNullOrZero(listData.get(i).getChanel()) ? "" : BundleUtils.getLangString("campaign.chanel." + listData.get(i).getChanel(), locale));
-            WorkBookBuilder.writeCellContent(row, styleRow, col++, listData.get(i).getStartTime());
-            WorkBookBuilder.writeCellContent(row, styleRow, col++, listData.get(i).getEndTime());
+            WorkBookBuilder.writeCellContent(row, styleRow, col++, DateTimeUtil.format("dd/MM/yyyy",listData.get(i).getStartTime(), ""));
+            WorkBookBuilder.writeCellContent(row, styleRow, col++, DateTimeUtil.format("dd/MM/yyyy",listData.get(i).getEndTime(), ""));
             WorkBookBuilder.writeCellContent(row, styleRow, col++, DataUtil.isNullOrZero(listData.get(i).getCustomerNumber()) ? 0 : listData.get(i).getCustomerNumber());
             WorkBookBuilder.writeCellContent(row, styleRow, col++, DataUtil.isNullOrZero(listData.get(i).getNumOfJoinedCus()) ? 0 : listData.get(i).getNumOfJoinedCus());
             WorkBookBuilder.writeCellContent(row, styleRow, col++, DataUtil.isNullOrZero(listData.get(i).getNumOfInteractedCus()) ? 0 : listData.get(i).getNumOfInteractedCus());