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 3b3d75fa1..8e00a08a9 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 4ac6041df..d71e366be 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 91d30d8d5..6c4ae681a 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 92fec4a49..8a7ec98b0 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