From 2d013045f27fd4ffae7794b89bd790da684f8b65 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 2 Dec 2021 16:30:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D=E5=92=8C?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/IcPartyActivityController.java | 5 +++-- .../java/com/epmet/controller/IcPartyUnitController.java | 5 +++-- .../src/main/java/com/epmet/excel/IcPartyActivityExcel.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java index a337995822..a17609835d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java +++ b/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 list = icPartyActivityService.list(formDTO); List 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()); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index d26e922f09..ec06c3bf5f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/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 list = icPartyUnitService.list(formDTO); List 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(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java index f2b54f5a36..c39b3f9147 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java +++ b/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; } \ No newline at end of file