From f835362043efd2ff8fc6f1c335286fa617e03eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 31 Aug 2023 11:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java   | 1 +
 .../java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java    | 2 ++
 src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml  | 2 ++
 src/main/resources/schemas/schema_v2.2.sql                      | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java
index 3b3d75fa..8e00a08a 100644
--- a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java
+++ b/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java
@@ -108,6 +108,7 @@ public class DeviceRepairOrderEntity {
      * 报修图片
      */
     private String uploadImage;
+    private String inspectUser;
 
 
     /**
diff --git a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java
index 4ac6041d..d71e366b 100644
--- a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java
@@ -146,5 +146,7 @@ public class DeviceRepairOrderResponse {
      * 维修图片
      */
     private String repariImage;
+    private String inspectUser;
+    private String inspectUserName;
 
 }
diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml
index 91d30d8d..6c4ae681 100644
--- a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml
@@ -29,8 +29,10 @@
                t.repariName,
                t.repariImage,
                t.repariRemark,
+               t.inspectUser,
                (select employeeName from auth_user where id = t.createUser) createUserName,
                (select employeeName from auth_user where id = t.auditUser)  auditUserName,
+               (select employeeName from auth_user where id = t.inspectUser) inspectUserName,
                (select `name` from auth_dept where code = t.deptCode)       deptName,
                (select `name` from auth_warehouse where code = t.invCode)   invName,
                (select employeeName from auth_user where id = t.repariName)  repName,
diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql
index 92fec4a4..8a7ec98b 100644
--- a/src/main/resources/schemas/schema_v2.2.sql
+++ b/src/main/resources/schemas/schema_v2.2.sql
@@ -273,3 +273,5 @@ INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`,
 VALUES (2090, 0, '更新第三方产品信息是否选入耗材字典', 'update_third_in_rel', '0', 0, 0, '更新第三方产品信息是否选入耗材字典(0：否；1：是)', NULL);
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkWebNewType', 'tinyint', 1);
+
+CALL Pro_Temp_ColumnWork('device_repair_order', 'inspectUser', 'varchar(255)', 1);
\ No newline at end of file