From 30a42231ba1df62a1609586ed35ea69249e03692 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期六, 10 八月 2024 17:33:26 +0800 Subject: [PATCH] 电站评价列表 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java index 94f423b..b1b5ca5 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java @@ -2,8 +2,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.order.api.model.TChargingOrder; import com.ruoyi.order.api.model.TOrderEvaluate; +import com.ruoyi.order.api.query.TOrderEvaluateQuery; +import com.ruoyi.order.api.vo.TOrderEvaluateVO; +import com.ruoyi.order.mapper.TChargingOrderMapper; import com.ruoyi.order.mapper.TOrderEvaluateMapper; import com.ruoyi.order.mapper.TOrderEvaluateTagMapper; import com.ruoyi.order.service.TOrderEvaluateService; @@ -11,6 +17,7 @@ import com.ruoyi.other.api.vo.TEvaluationTagVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.util.Comparator; import java.util.List; @@ -32,8 +39,10 @@ private TEvaluationTagClient evaluationTagClient; @Autowired private TOrderEvaluateTagMapper orderEvaluateTagMapper; + @Autowired + private TChargingOrderMapper chargingOrderMapper; @Override - public List<TEvaluationTagVO> getTagList() { + public List<TEvaluationTagVO> getTagCount() { // 查询标签列表 R<List<TEvaluationTagVO>> r = evaluationTagClient.getTagList(); List<TEvaluationTagVO> tagList = r.getData(); @@ -61,6 +70,28 @@ return tagList; } + @Override + public PageInfo<TOrderEvaluateVO> getTagList(TOrderEvaluateQuery query) { + PageInfo<TOrderEvaluateVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize()); + // 查询站点下的所有订单 + List<TChargingOrder> tChargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class) + .eq(TChargingOrder::getSiteId, query.getSiteId())); + if(CollectionUtils.isEmpty(tChargingOrders)){ + return new PageInfo<>(); + } + List<Long> orderIds = tChargingOrders.stream().map(TChargingOrder::getId).collect(Collectors.toList()); + query.setOrderIds(orderIds); + List<TOrderEvaluateVO> list = this.baseMapper.pageList(query,pageInfo); + pageInfo.setRecords(list); + return pageInfo; + } + + /** + * 统计有图,好评,中差评数量 + * @param count + * @param name + * @param tagList + */ private void packageTagCount(Long count,String name,List<TEvaluationTagVO> tagList){ if(count>0){ TEvaluationTagVO evaluationTagVO = new TEvaluationTagVO(); -- Gitblit v1.7.1