diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java index 20d949ac..f807f2c6 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java @@ -317,7 +317,7 @@ public class RepairStatisticsController { /** * @description : 工种类型统计 - * @author AI + * @author xyc * @date 2025/11/1 * @param reqVO {@link QueryBusinessReqVO} * @return cn.iocoder.yudao.framework.common.pojo.CommonResult diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java index 445dd526..5d29d9b2 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java @@ -211,7 +211,7 @@ public interface RepairStatisticsService { /** * @description : 工种类型统计 - * @author AI + * @author xyc * @date 2025/11/1 * @param reqVO {@link QueryBusinessReqVO} * @return java.util.List> diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java index df508098..21397a08 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.base.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.common.TicketsStatusEnum; import cn.iocoder.yudao.module.base.entity.StaffStatisticsResp; import cn.iocoder.yudao.module.base.mapper.RepairStatisticsMapper; import cn.iocoder.yudao.module.base.service.RepairStatisticsService; @@ -410,7 +411,7 @@ public class RepairStatisticsServiceImpl implements RepairStatisticsService { /** * @description : 工种类型统计 - * @author AI + * @author xyc * @date 2025/11/1 * @param reqVO {@link QueryBusinessReqVO} * @return java.util.List> @@ -464,6 +465,18 @@ public class RepairStatisticsServiceImpl implements RepairStatisticsService { } } + /*服务顾问统计接了多少单*/ + long count = ticketsService.count(Wrappers.lambdaQuery() + .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), DlRepairTickets::getCreateTime, startDate, endDate)); + resp.add(new HashMap() {{ + put("name", "服务顾问"); + put("id", "fwgw"); + put("count", count); + }}); + + /*总检 合格了多少 返工了多少*/ + + return resp; } @@ -501,7 +514,7 @@ public class RepairStatisticsServiceImpl implements RepairStatisticsService { // 维修中(按 repairType 分组) Map workingStats = ticketsInRange.stream() - .filter(item -> "04".equals(item.getTicketsStatus())) // 假设04是维修中的状态码 + .filter(item -> TicketsStatusEnum.WORKING.getCode().equals(item.getTicketsStatus())) // .collect(Collectors.groupingBy(DlRepairTickets::getRepairType, Collectors.counting())); statsList.add(createStatsNode("workingNum", "维修中", workingStats, "weixiuzhong", true)); diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java index 2382efda..c519fa39 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java @@ -1170,6 +1170,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl