From f858e3fad53e7e1f9f19affa509b8ab73b088338 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Mon, 16 Nov 2020 14:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E3=80=91=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E9=AD=8F=E5=87=AF?= =?UTF-8?q?=202020-11-16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcEventsController.java | 3 +- .../modules/events/excel/UnEventsExcel.java | 6 ++-- .../modules/issue/excel/UnDisposeExcel.java | 32 +++++++++++-------- .../item/excel/ItemTimeoutNewExcel.java | 22 ------------- 4 files changed, 24 insertions(+), 39 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java index d8f8fb225..c11c14c5e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java @@ -35,6 +35,7 @@ import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.modules.events.excel.EpdcEventsExcel; import com.elink.esua.epdc.modules.events.excel.UnEventsExcel; +import com.elink.esua.epdc.modules.events.excel.rejectEventsExcel; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -214,7 +215,7 @@ public class EpdcEventsController { @GetMapping("rejectEventsExport") public void rejectEventsExport(@RequestParam Map params, HttpServletResponse response) throws Exception { List list= epdcEventsService.rejectEventsExportList(params); - ExcelUtils.exportExcelToTarget(response, "已驳回", list, UnEventsExcel.class); + ExcelUtils.exportExcelToTarget(response, "已驳回", list, rejectEventsExcel.class); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/UnEventsExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/UnEventsExcel.java index bccbcc254..a4b5a8028 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/UnEventsExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/UnEventsExcel.java @@ -3,6 +3,8 @@ package com.elink.esua.epdc.modules.events.excel; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; +import java.util.Date; + /** * 议题管理 - 待回应 导出类 * @@ -14,8 +16,8 @@ public class UnEventsExcel { @Excel(name = "议题内容") private String eventContent; - @Excel(name = "提交时间") - private String createdTime; + @Excel(name = "提交时间",exportFormat="yyyy-MM-dd HH:mm:ss",importFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; @Excel(name = "提交人") private String nickName; @Excel(name = "所属网格") diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/UnDisposeExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/UnDisposeExcel.java index abc5ec272..0dd2853db 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/UnDisposeExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/excel/UnDisposeExcel.java @@ -8,6 +8,12 @@ import java.util.Date; @Data public class UnDisposeExcel { + /** + * 议题编号 + */ + @Excel(name = "议题编号") + private String issueCode; + /** * 议题内容 */ @@ -16,13 +22,24 @@ public class UnDisposeExcel { /** * 提交时间 */ - @Excel(name = "提交时间") + @Excel(name = "提交时间",exportFormat="yyyy-MM-dd HH:mm:ss",importFormat = "yyyy-MM-dd HH:mm:ss") private Date createdTime; /** * 提交人 */ @Excel(name = "提交人") private String nickName; + + /** + * 来源：话题名称或者‘党群议事’ + */ + @Excel(name = "来源") + private String groupName; + + @Excel(name = "所属网格") + private String allDeptName; + + /** * 参与人数 */ @@ -49,18 +66,5 @@ public class UnDisposeExcel { @Excel(name = "浏览数") private Integer browseNum; - /** - * 议题编号 - */ - @Excel(name = "议题编号") - private String issueCode; - /** - * 来源：话题名称或者‘党群议事’ - */ - @Excel(name = "来源") - private String groupName; - - @Excel(name = "所属网格") - private String allDeptName; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemTimeoutNewExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemTimeoutNewExcel.java index ac73f6689..56b4fa4f2 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemTimeoutNewExcel.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemTimeoutNewExcel.java @@ -23,21 +23,6 @@ public class ItemTimeoutNewExcel { */ @Excel(name = "项目状态") private String itemState; - /** - * 项目统计年月 - */ - @Excel(name = "项目统计年月") - private String totalYearMonth; - /** - * 项目发布时间 - */ - @Excel(name = "项目发布时间") - private String distributeTime; - /** - *最近一次处理时间 - */ - @Excel(name = "最近一次处理时间") - private String lastHandleTime; /** * 转项目时间 */ @@ -51,13 +36,6 @@ public class ItemTimeoutNewExcel { /** * 电话 */ - @Excel(name = "电话") - private String mobile; - /** - * 项目满意度 - */ - @Excel(name = "项目满意度") - private String evaluationScore; /** * 支持数 */