From 4f78a9d59680cf17878c1234d6266a98772a2591 Mon Sep 17 00:00:00 2001 From: HAHA Date: Fri, 20 May 2022 13:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=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 --- .../main/java/com/epmet/dto/form/PartyTypepercentFormDTO.java | 2 ++ .../main/java/com/epmet/controller/IcPartyUnitController.java | 3 ++- .../src/main/java/com/epmet/dao/IcPartyUnitDao.java | 3 ++- .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java | 2 +- .../src/main/resources/mapper/IcPartyUnitDao.xml | 1 + .../main/java/com/epmet/dto/form/VolunteerPolyPieFormDTO.java | 2 ++ .../java/com/epmet/controller/IcVolunteerPolyController.java | 4 +++- .../src/main/resources/mapper/IcVolunteerPolyDao.xml | 2 ++ 8 files changed, 15 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyTypepercentFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyTypepercentFormDTO.java index f5bdb317af..2ef86fc61c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyTypepercentFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyTypepercentFormDTO.java @@ -19,4 +19,6 @@ public class PartyTypepercentFormDTO { */ @NotBlank(message = "组织id不能为空") private String agencyId; + + private String customerId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 03bcf813ba..c3f5d3c4ab 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -260,7 +260,8 @@ public class IcPartyUnitController { * @date 2022/5/18 16:42 */ @PostMapping("/statistics/typepercent") - public Result> getTypepercent(@RequestBody PartyTypepercentFormDTO form) { + public Result> getTypepercent(@RequestBody PartyTypepercentFormDTO form,@LoginUser TokenDto tokenDto) { + form.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(form); List dto = icPartyUnitService.getTypepercent(form); return new Result>().ok(dto); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java index 363357e054..2d4886bf60 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java @@ -88,5 +88,6 @@ public interface IcPartyUnitDao extends BaseDao { * * @param agencyId */ - List getTypepercent(@Param("agencyId") String agencyId); + List getTypepercent(@Param("agencyId") String agencyId, + @Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index aad04a4b53..8b0ee7e390 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -631,7 +631,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl result = baseDao.getTypepercent(form.getAgencyId()); + List result = baseDao.getTypepercent(form.getAgencyId(),form.getCustomerId()); Map map = result.stream().collect(Collectors.toMap(PartyTypepercentResultDTO::getCode, PartyTypepercentResultDTO::getValue)); int sum = result.stream().mapToInt(PartyTypepercentResultDTO::getValue).sum(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml index 7c4d734729..d5d5f01079 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml @@ -121,6 +121,7 @@ WHERE a.DEL_FLAG = '0' AND a.AGENCY_ID = #{agencyId} + AND a.CUSTOMER_ID = #{customerId} GROUP BY a.type diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyPieFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyPieFormDTO.java index d0acad6b7e..38cbe0491f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyPieFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VolunteerPolyPieFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; @Data @@ -9,6 +10,7 @@ public class VolunteerPolyPieFormDTO implements Serializable { private static final long serialVersionUID = 6284245738483042805L; + @NotBlank(message = "agencyId必填") private String agencyId; private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java index 110f2d7241..66187d1cda 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVolunteerPolyController.java @@ -144,7 +144,9 @@ public class IcVolunteerPolyController { * @date 2022/5/19 17:21 */ @PostMapping("statistics") - public Result> getStatistics(@RequestBody VolunteerPolyPieFormDTO form) { + public Result> getStatistics(@RequestBody VolunteerPolyPieFormDTO form,@LoginUser TokenDto tokenDto) { + form.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(form); List dto = icVolunteerPolyService.getStatistics(form); return new Result>().ok(dto); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml index 35730fea52..df518e0aad 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml @@ -64,6 +64,8 @@ FROM ic_volunteer_poly p LEFT JOIN ic_volunteer_poly_category c ON p.ID_CARD = c.ID_CARD + where + p.CUSTOMER_ID = #{customerId} GROUP BY c.VOLUNTEER_CATEGORY