From f2127fdb16215c3b1c439b808aa80e019e9252f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Fri, 4 Aug 2023 09:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=B8=A4=E7=A5=A8=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardTicket/service/impl/StandardTicketInfoServiceImpl.java | 4 +++- .../hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index ab8a946..4da8447 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -729,7 +729,9 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl createDept = userClient.getDataScope(bladeUser.getUserId()); - + log.info("================================================================"); + log.info("获取权限Id =======================> ", createDept); + log.info("================================================================"); StandardTicketInfoDto standardTicketInfoDto = new StandardTicketInfoDto(); BeanUtils.copyProperties(ticketCountQueryVo, standardTicketInfoDto); LambdaQueryWrapper queryWrapper = this.getQueryWrapper(standardTicketInfoDto); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java index 1b94fa1..915a6ea 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketCountServiceImpl.java @@ -405,7 +405,8 @@ public class TicketCountServiceImpl extends BaseServiceImpl getStandardTicketCountList(List createDept, List items, String ticketType, String dateTime, BladeUser user) { + private List + getStandardTicketCountList(List createDept, List items, String ticketType, String dateTime, BladeUser user) { List ticketInfoEntities = standardTicketInfoService.selectStandardTicketByDeptIdWithTicketType(createDept, ticketType, dateTime); if (CollectionUtils.isEmpty(ticketInfoEntities)) { @@ -459,6 +460,7 @@ public class TicketCountServiceImpl extends BaseServiceImpl evaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); evaluateEntityLambdaQueryWrapper.in(TicketInfoEvaluateEntity::getTicketId, ticketIdList); evaluateEntityLambdaQueryWrapper.eq(BaseEntity::getStatus, 1); + evaluateEntityLambdaQueryWrapper.groupBy(TicketInfoEvaluateEntity::getTicketId); List evaluateEntities = ticketInfoEvaluateService.list(evaluateEntityLambdaQueryWrapper); ticketCount.setTicketProportionNum(evaluateEntities.size()); @@ -549,6 +551,7 @@ public class TicketCountServiceImpl extends BaseServiceImpl evaluateEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); evaluateEntityLambdaQueryWrapper.in(TicketInfoEvaluateEntity::getTicketId, ticketIdList); evaluateEntityLambdaQueryWrapper.eq(BaseEntity::getStatus, 1); + evaluateEntityLambdaQueryWrapper.groupBy(TicketInfoEvaluateEntity::getTicketId); List evaluateEntities = ticketInfoEvaluateService.list(evaluateEntityLambdaQueryWrapper); ticketCount.setTicketProportionNum(evaluateEntities.size());