From 8e0144c808e3b45a6f1384b807ca1f049979b01f Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 18 May 2022 10:29:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=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 | 6 ++++-- .../modules/partymember/dao/IcPartyMemberPointDao.java | 6 ++++-- .../partymember/service/IcPartyMemberPointService.java | 3 ++- .../service/impl/IcPartyMemberPointServiceImpl.java | 8 +++++--- .../mapper/partymember/IcPartyMemberPointDao.xml | 2 ++ 5 files changed, 17 insertions(+), 8 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 ed63e28c5e..81dcbd7c78 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 @@ -1,7 +1,9 @@ package com.epmet.modules.partymember.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; @@ -89,8 +91,8 @@ public class IcPartyMemberPointController { * @date 2022/5/17 17:19 */ @PostMapping("getList") - public Result> getList(@RequestBody PartyMemberPointListFormDTO form) { - List dto = icPartyMemberPointService.getList(form); + public Result> getList(@RequestBody PartyMemberPointListFormDTO form, @LoginUser TokenDto tokenDto) { + List dto = icPartyMemberPointService.getList(form,tokenDto); 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 cd7c89ace4..64e41932b9 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 @@ -23,7 +23,9 @@ public interface IcPartyMemberPointDao extends BaseDao @Param("mobile") String mobile, @Param("name") String name, @Param("orgId") String orgId, - @Param("year") String year); + @Param("year") String year, + @Param("customerId") String customerId); - List getListCount(@Param("year") String year); + List getListCount(@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 7ab1715c55..81eb14b2fc 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 @@ -2,6 +2,7 @@ package com.epmet.modules.partymember.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.modules.partymember.entity.IcPartyMemberPointEntity; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO; import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO; @@ -88,6 +89,6 @@ public interface IcPartyMemberPointService extends BaseService getList(PartyMemberPointListFormDTO form); + List getList(PartyMemberPointListFormDTO form, TokenDto tokenDto); } \ 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 58d41507c8..ff7d172d2d 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; @@ -16,6 +17,7 @@ import com.epmet.resi.partymember.dto.partymember.IcPartyMemberPointDTO; import com.epmet.resi.partymember.dto.partymember.PartyMemberPointListCountDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberPointListFormDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberPointListResultDTO; +import jdk.nashorn.internal.parser.Token; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -90,10 +92,10 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl getList(PartyMemberPointListFormDTO form) { + public List getList(PartyMemberPointListFormDTO form, TokenDto tokenDto) { List dto = baseDao.getList(form.getIdCard(), form.getMobile(), form.getName(), - form.getOrgId(), form.getYear()); - List count = baseDao.getListCount(form.getYear()); + form.getOrgId(), form.getYear(),tokenDto.getCustomerId()); + List count = baseDao.getListCount(form.getYear(),tokenDto.getCustomerId()); // 处理统计的平均值 for (int i = 0; i < dto.size(); i++) { // 基础积分分值平均值 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 098b976acb..7392a9426f 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 @@ -25,6 +25,7 @@ AND c.DEL_FLAG = '0' u.DEL_FLAG = '0' + AND u.CUSTOMER_ID = #{customerId} AND u.NAME = #{name} @@ -61,6 +62,7 @@ AND a.DEL_FLAG = '0' u.DEL_FLAG = '0' + AND u.CUSTOMER_ID = #{customerId} AND a.year = #{year}