From dbf1f1065c6b2ed098977324a6824bd608eb570a Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Sun, 29 Sep 2019 17:01:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=92=8C=E6=96=B0=E9=97=BB=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/NewsController.java | 7 +++++++ .../src/main/resources/mapper/NewsDao.xml | 2 +- .../epdc/controller/PartyMembersController.java | 3 ++- .../elink/esua/epdc/controller/UserController.java | 14 ++++++++++++-- .../java/com/elink/esua/epdc/excel/UserExcel.java | 2 ++ .../epdc/service/impl/PartyMembersServiceImpl.java | 4 +--- 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java index b8e8ff732..15774e20a 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NewsController.java @@ -84,6 +84,13 @@ public class NewsController { ExcelUtils.exportExcelToTarget(response, null, list, NewsExcel.class); } + /*** + * 下线 + * @param parmas + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2019/9/29 15:14 + */ @PostMapping("modifyOnLine") public Result modifyOnLine(@RequestBody Map parmas) { boolean b = newsService.modifyOnLine(parmas); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml index 8e476da8b..22168af5b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsDao.xml @@ -36,7 +36,7 @@ AND en.NEWS_UP_DOWN_STATE = '0' AND en.DEL_FLAG = '0' ORDER BY - en.NEWS_RELEASE_START_TIME DESC + en.NEWS_RELEASE_START_TIME DESC,en.CREATED_TIME DESC LIMIT #{pageIndex},#{pageSize} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index c43cf3481..cfb9cd7b0 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java @@ -109,10 +109,11 @@ public class PartyMembersController { } @GetMapping("export") + @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = partyMembersService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, PartyMembersExcel.class); + ExcelUtils.exportExcelToTarget(response, "党员管理", list, PartyMembersExcel.class); } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 64fe569f1..d170b8d68 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -108,8 +109,17 @@ public class UserController { @GetMapping("export") public void export( @RequestParam Map params, HttpServletResponse response) throws Exception { List list = userService.list(params); - - ExcelUtils.exportExcelToTarget(response, null, list, UserExcel.class); + String auditState = (String) params.get("auditState"); + // 状态(0-未审核，1-审核通过，2-审核未通过) + String fileName = null; + if(NumConstant.ZERO_STR.equals(auditState)){ + fileName="未审核"; + }else if(NumConstant.ONE_STR.equals(auditState)){ + fileName="审核通过"; + }else if(NumConstant.TWO_STR.equals(auditState)){ + fileName="审核未通过"; + } + ExcelUtils.exportExcelToTarget(response, fileName, list, UserExcel.class); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java index c325257ea..38bb3dc46 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java @@ -30,6 +30,8 @@ import java.util.Date; */ @Data public class UserExcel { + @Excel(name = "提交时间", format = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; @Excel(name = "真实姓名") private String realName; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index 01c01d507..bba267d05 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -78,9 +78,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, PartyMembersDTO.class); + return baseDao.pageDIY(params); } private QueryWrapper getWrapper(Map params){