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; }