From 6b4ce23c1c60794d6bf03a2cc8f56f71601d7ce7 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 24 May 2022 15:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyMemberPointController.java | 4 ++-- .../modules/partymember/dao/IcPartyMemberPointDao.java | 3 ++- .../partymember/service/IcPartyMemberPointService.java | 2 +- .../service/impl/IcPartyMemberPointServiceImpl.java | 9 +++++---- .../mapper/partymember/IcPartyMemberPointDao.xml | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java index d9418bb8f5..86a8571efe 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java @@ -115,7 +115,7 @@ public class IcPartyMemberPointController { * @date 2022/5/24 14:26 */ @PostMapping("export") - public void export(@RequestBody PartyMemberExportFormDTO formDto, HttpServletResponse response) throws Exception { + public void export(@RequestBody PartyMemberExportFormDTO formDto,@LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception { formDto.setIsPage(false); formDto.setPageSize(NumConstant.TEN_THOUSAND); @@ -129,7 +129,7 @@ public class IcPartyMemberPointController { PageData page = null; WriteSheet writeSheet = EasyExcel.writerSheet("量化积分").registerWriteHandler(new FreezeAndFilter()).build(); do { - page = icPartyMemberPointService.getExport(formDto); + page = icPartyMemberPointService.getExport(formDto,tokenDto.getCustomerId()); List list = ConvertUtils.sourceToTarget(page.getList(), IcPartyMemberPointExcel.class); list.forEach(item -> { item.setIndex(i.getAndIncrement()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java index 856fb6757d..4f30eb9a51 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberPointDao.java @@ -38,5 +38,6 @@ public interface IcPartyMemberPointDao extends BaseDao @Param("year") String year, @Param("customerId") String customerId); - List getExport(@Param("form") PartyMemberExportFormDTO form); + List getExport(@Param("form") PartyMemberExportFormDTO form, + @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java index f559fd6ff0..29db1db7bb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java @@ -113,5 +113,5 @@ public interface IcPartyMemberPointService extends BaseService getExport(PartyMemberExportFormDTO form); + PageData getExport(PartyMemberExportFormDTO form,String customerId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java index 63d096cad9..1ea27ad263 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java @@ -167,11 +167,12 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl getExport(PartyMemberExportFormDTO form) { + public PageData getExport(PartyMemberExportFormDTO form,String customerId) { PageHelper.startPage(form.getPageNo(), form.getPageSize(), form.getIsPage()); - List list = baseDao.getExport(form); - PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + List dto = baseDao.getExport(form,customerId); + + PageInfo pageInfo = new PageInfo<>(dto); + return new PageData<>(dto, pageInfo.getTotal()); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml index 275e4f61ba..9c600e7309 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPointDao.xml @@ -120,7 +120,7 @@ AND c.DEL_FLAG = '0' u.DEL_FLAG = '0' - + AND u.CUSTOMER_ID = #{customerId} AND u.NAME = #{form.name}