From a7d96d5e17bf87178e6acac985d3e1a2e86d0d7b Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 19 May 2022 08:59:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8F=E5=8C=96=E7=A7=AF=E5=88=86=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partymember/result/PartyMemberPointEchoResultDTO.java | 2 ++ .../partymember/controller/IcPartyMemberPointController.java | 4 ++-- .../epmet/modules/partymember/dao/IcPartyMemberPointDao.java | 3 ++- .../partymember/service/IcPartyMemberPointService.java | 2 +- .../service/impl/IcPartyMemberPointServiceImpl.java | 4 ++-- .../resources/mapper/partymember/IcPartyMemberPointDao.xml | 2 ++ 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointEchoResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointEchoResultDTO.java index 080da2ef8d..42b93cd711 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointEchoResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartyMemberPointEchoResultDTO.java @@ -52,4 +52,6 @@ public class PartyMemberPointEchoResultDTO implements Serializable { * 警示扣分选项 */ private String warnOptions; + + private String id; } 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 256a56642d..fd2277d091 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 @@ -107,9 +107,9 @@ public class IcPartyMemberPointController { * @date 2022/5/18 18:18 */ @PostMapping("echoPartyMemberPoint") - public Result getEchoPartyMemberPoint(@RequestBody PartyMemberPointEchoFormDTO form) { + public Result getEchoPartyMemberPoint(@RequestBody PartyMemberPointEchoFormDTO form,@LoginUser TokenDto tokenDto) { ValidatorUtils.validateEntity(form); - List dto = icPartyMemberPointService.getEchoPartyMemberPoint(form); + List dto = icPartyMemberPointService.getEchoPartyMemberPoint(form,tokenDto.getCustomerId()); return new Result().ok(dto); } 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 0d128f3ed7..11f7c53e8d 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 @@ -32,5 +32,6 @@ public interface IcPartyMemberPointDao extends BaseDao List getEchoPartyMemberPoint(@Param("partyMemberId") String partyMemberId, @Param("quarter") String quarter, - @Param("year") String year); + @Param("year") String year, + @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 2c11d65d4f..c73ccedbf1 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 @@ -101,5 +101,5 @@ public interface IcPartyMemberPointService extends BaseService getEchoPartyMemberPoint(PartyMemberPointEchoFormDTO form); + List getEchoPartyMemberPoint(PartyMemberPointEchoFormDTO 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 875ed05bf7..bda0cb98a9 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 @@ -148,8 +148,8 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl getEchoPartyMemberPoint(PartyMemberPointEchoFormDTO form) { - List dto = baseDao.getEchoPartyMemberPoint(form.getPartyMemberId(), form.getQuarter(), form.getYear()); + public List getEchoPartyMemberPoint(PartyMemberPointEchoFormDTO form,String customerId) { + List dto = baseDao.getEchoPartyMemberPoint(form.getPartyMemberId(), form.getQuarter(), form.getYear(),customerId); return dto; } 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 f02e41db4e..d4eecf5891 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 @@ -78,6 +78,7 @@