From de264c529a3e409ece944a6cf5cb20b559ea7402 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Mon, 18 Nov 2024 14:28:44 +0800 Subject: [PATCH] 1 --- .../tickets/controller/admin/DlRepairTicketsController.java | 6 +++--- .../module/tickets/service/DlRepairTicketsService.java | 2 +- .../tickets/service/impl/DlRepairTicketsServiceImpl.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java index 2332f8d5..9df94d05 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java @@ -317,9 +317,9 @@ public class DlRepairTicketsController { * @return cn.iocoder.yudao.framework.common.pojo.CommonResult **/ @GetMapping("/getBossNum") - @Operation(summary = "从总检的角度差维修中、已完成的工单数量") - public CommonResult getBossNum() { - return success(dlRepairTicketsService.getBossNum()); + @Operation(summary = "从总检的角度查维修中、已完成的工单数量") + public CommonResult getBossNum(String selectType) { + return success(dlRepairTicketsService.getBossNum(selectType)); } /** diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java index f7d0f273..64af5c95 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java @@ -172,7 +172,7 @@ public interface DlRepairTicketsService extends IService { * @date 11:30 2024/10/24 * @return java.util.Map **/ - Map getBossNum(); + Map getBossNum(String selectType); /** * 服务顾问通知客户取车 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 2c080f98..3efcceb2 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 @@ -1404,10 +1404,11 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl getBossNum() { + public Map getBossNum(String selectType) { Map rtnMap = new HashMap<>(); int workingNum = 0; int doneNum = 0; + List repairTickets = this.list(); if (!repairTickets.isEmpty()) { Map> ifFinishMap = repairTickets.stream().collect(Collectors.groupingBy(DlRepairTickets::getIsFinish));