From a2dbbf57a0abe70e2400a26fbdca7d044801a246 Mon Sep 17 00:00:00 2001
From: zhouxinyu <121470181@qq.com>
Date: Mon, 20 Jan 2025 14:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=9C=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BA=BA=E5=91=98=E5=90=8D=E7=A7=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/contraller/WorkOrderController.java     | 5 +++++
 .../modules/business/pojo/entity/workorder/WorkOrder.java    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
index c4d1915..7f5f7b9 100644
--- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
@@ -33,6 +33,7 @@ import org.springblade.modules.business.service.IWorkOrderFlowService;
 import org.springblade.modules.business.service.IWorkOrderService;
 import org.springblade.modules.system.pojo.entity.Dept;
 import org.springblade.modules.system.pojo.entity.User;
+import org.springblade.modules.system.pojo.entity.UserInfo;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IUserService;
 import org.springframework.web.bind.annotation.*;
@@ -145,6 +146,10 @@ public class WorkOrderController extends BladeController {
             if (Func.isNotEmpty(dept)) {
                 order.setReportUnitName(dept.getDeptName());
             }
+            User user = userService.getById(order.getRepairPerson());
+            if (Func.isNotEmpty(user)) {
+                order.setRepairPersonName(user.getName());
+            }
         });
 
         // 返回查询结果
diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java b/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java
index 33758db..394da93 100644
--- a/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java
+++ b/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java
@@ -256,4 +256,9 @@ public class WorkOrder extends BaseEntity {
      */
     @JsonSerialize(nullsUsing = NullSerializer.class)
     private Double travelExpense;
+
+    /**
+     * 维修人员名称
+     */
+    private String repairPersonName;
 }