From 5ddf7af4a2817c39e1fab512b56741619ec5c4ec Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:36:22 +0800
Subject: [PATCH] yys 维修，保养添加督办人
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 4 +++-
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 3 +++
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 6 ++++++
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java | 3 +++
4 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 560d87e..7af3e76 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -13,6 +13,12 @@
@Data
public class DeviceRepairDto {
+ @ApiModelProperty("鐫ｅ姙浜�")
+ private String supervisoryName;
+
+ @ApiModelProperty("瀹℃牳浜�")
+ private String auditName;
+
@ApiModelProperty("璁惧鎶ヤ慨id")
private Long id;
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index ee92be3..9096eff 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -58,6 +58,9 @@
@ApiModelProperty("瀹℃牳浜�")
private String auditName;
+ @ApiModelProperty("鐫ｅ姙浜�")
+ private String supervisoryName;
+
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index 1f7b3f2..d40352f 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -82,6 +82,9 @@
@Excel(name = "瀹℃牳浜�")
private String auditName;
+ @ApiModelProperty("鐫ｅ姙浜�")
+ private String supervisoryName;
+
@ApiModelProperty(value = "杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�")
private Integer deleted;
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 317009b..fc825bd 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -22,7 +22,9 @@
dr.repair_price,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ dr.audit_name,
+ dr.supervisory_name
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
--
Gitblit v1.9.3