Merge branch 'dev_ic_v2' into develop

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java

@@ -21,6 +21,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -87,7 +88,7 @@ public class IcPartyActivityController {
     public void export(@RequestBody PartyActivityFormDTO formDTO, HttpServletResponse response) throws Exception {
         List<IcPartyActivityDTO> list = icPartyActivityService.list(formDTO);
         List<IcPartyActivityExcel> excelList = new ArrayList<>();
-        AtomicInteger i = new AtomicInteger(0);
+        AtomicInteger i = new AtomicInteger(1);
         if (CollectionUtils.isNotEmpty(list)) {
             excelList = list.stream().map(item -> {
                 IcPartyActivityExcel excel = new IcPartyActivityExcel();
@@ -96,7 +97,7 @@ public class IcPartyActivityController {
                 excel.setTitle(item.getTitle());
                 excel.setAddress(item.getAddress());
                 excel.setPeopleCount(item.getPeopleCount());
-                excel.setActivityTime(item.getActivityTime());
+                excel.setActivityTime(DateUtils.format(item.getActivityTime(), DateUtils.DATE_TIME_PATTERN));
                 return excel;
             }).collect(Collectors.toList());
         }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java

@@ -92,10 +92,11 @@ public class IcPartyUnitController {
     }
 
     @PostMapping("export")
-    public void export(@RequestBody PartyUnitFormDTO formDTO, HttpServletResponse response) throws Exception {
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody PartyUnitFormDTO formDTO, HttpServletResponse response) throws Exception {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         List<IcPartyUnitDTO> list = icPartyUnitService.list(formDTO);
         List<IcPartyUnitExcel> excelList = new ArrayList<>();
-        AtomicInteger i = new AtomicInteger(0);
+        AtomicInteger i = new AtomicInteger(1);
         if (CollectionUtils.isNotEmpty(list)) {
             excelList = list.stream().map(item -> {
                 IcPartyUnitExcel excel = new IcPartyUnitExcel();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java

@@ -18,6 +18,7 @@
 package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -47,6 +48,6 @@ public class IcPartyActivityExcel {
     private Integer peopleCount;
 
     @Excel(name = "活动时间")
-    private Date activityTime;
+    private String activityTime;
 
 }