From c3c4cdcb1821b1a2ea6df63547201704f0daf498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?=
 <14281818+xue-hongxiang@user.noreply.gitee.com>
Date: Thu, 2 Jan 2025 16:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/contraller/WorkBenchesController.java    | 4 ++--
 .../modules/business/service/impl/WorkOrderServiceImpl.java   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java
index ca96f09..f491499 100644
--- a/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java
@@ -136,11 +136,11 @@ public class WorkBenchesController extends BladeController {
         total.add(tasks.size());
         map.put("total", total);
         List<Long> completed = new ArrayList<>();
-        completed.add(workOrders.stream().filter(plan -> plan.getStatus() == 8).count());
+        completed.add(workOrders.stream().filter(plan -> Set.of(202, 203, 204).contains(plan.getStatus())).count());
         completed.add(tasks.stream().filter(plan -> plan.getTaskStatus() == 4).count());
         map.put("completed", completed);
         List<Long> unCompleted = new ArrayList<>();
-        unCompleted.add(workOrders.stream().filter(plan -> plan.getStatus() != 8).count());
+        unCompleted.add(workOrders.stream().filter(plan -> !Set.of(202, 203, 204).contains(plan.getStatus())).count());
         unCompleted.add(tasks.stream().filter(plan -> plan.getTaskStatus() != 4).count());
         map.put("unCompleted", unCompleted);
         return R.data(map);
diff --git a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
index a725e62..24ac9e6 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
@@ -103,6 +103,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         workOrderVO.setMaterials(materials);
         User user = UserCache.getUser(workOrderVO.getInformant());
         workOrderVO.setInformantName(user != null ? user.getRealName() : "");
+        Dept dept = deptService.getOne(Wrappers.lambdaQuery(Dept.class).eq(Dept::getId, user.getDeptId()));
+        workOrderVO.setReportUnitName(dept.getDeptName());
         // 维修班组
         workOrderVO.setMaintenanceTeamName(SysCache.getDeptName(workOrderVO.getMaintenanceTeam()));
         // 维修人员