From 13c351d3c24beedf957fbc8e7c765b1256f1a421 Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Fri, 13 Nov 2020 18:25:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=B7=B2=E9=A9=B3=E5=9B=9E=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E3=80=91=E9=AD=8F=E5=87=AF?= =?UTF-8?q?=202020-11-13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/events/EpdcRejectEventsDTO.java | 1 + .../controller/EpdcEventsController.java | 14 ++++++++ .../events/excel/rejectEventsExcel.java | 33 +++++++++++++++++++ .../events/service/EpdcEventsService.java | 8 +++++ .../service/impl/EpdcEventsServiceImpl.java | 5 +++ .../resources/mapper/events/EpdcEventsDao.xml | 3 +- 6 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/rejectEventsExcel.java diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventsDTO.java index 5dca74f1a..62b01cfe3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventsDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcRejectEventsDTO.java @@ -31,4 +31,5 @@ public class EpdcRejectEventsDTO implements Serializable { * 来源：话题名称或者‘党群议事’ */ private String groupName; + private String allDeptName; } 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 4e9689745..d8f8fb225 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 @@ -203,5 +203,19 @@ public class EpdcEventsController { ExcelUtils.exportExcelToTarget(response, "待回应", list, UnEventsExcel.class); } + /*** + * 项目管理 -已驳回 + * @param params + * @param response + * @return void + * @author qushutong + * @date 2020/3/18 15:59 + */ + @GetMapping("rejectEventsExport") + public void rejectEventsExport(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list= epdcEventsService.rejectEventsExportList(params); + ExcelUtils.exportExcelToTarget(response, "已驳回", list, UnEventsExcel.class); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/rejectEventsExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/rejectEventsExcel.java new file mode 100644 index 000000000..35140ca26 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/rejectEventsExcel.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.modules.events.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +@Data +public class rejectEventsExcel { + + + /** + * 提交人 + */ + @Excel(name = "提交人") + private String nickName; + /** + * 提交时间 + */ + @Excel(name = "提交时间") + private String createdTime; + /** + * 时间内容 + */ + @Excel(name = "议题内容") + private String eventContent; + /** + * 来源：话题名称或者‘党群议事’ + */ + @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/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index 323ba0162..c3f2d6bb1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -297,4 +297,12 @@ public interface EpdcEventsService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result rejectEventsInfo(RejectRecordDTO dto); + /*** + * 项目管理 -已驳回 导出 + * @param params + * @return void + * @author wk + * @date 2020-11 + */ + List rejectEventsExportList(Map params); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 1b1f7e8f0..ecd5c7d4d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -783,6 +783,11 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl rejectEventsExportList(Map params) { + List list = baseDao.selectListOfRejectEvents(params); + return list; + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 2a7e19dba..e047cd97d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -102,7 +102,8 @@ WHEN trim( temp.GROUP_NAME ) != '' AND temp.GROUP_NAME IS NOT NULL THEN temp.GROUP_NAME ELSE '党群议事' - END ) AS groupName + END ) AS groupName, + temp.ALL_DEPT_NAMES as allDeptName FROM epdc_events temp WHERE