From 8be3506529c67cd0894ed1c8ae1bcefac0575ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 9 Aug 2023 16:36:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B7=A1=E6=A3=80=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E7=BA=A7=E5=88=AB?= =?UTF-8?q?=E5=92=8C=E4=BF=9D=E4=BF=AE=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/inv/DeviceInspectTaskEntity.java | 6 ++++++ .../glxp/api/req/inv/FilterDeviceInspectTakeRequest.java | 7 +++++++ .../com/glxp/api/res/inv/DeviceInspectTakeResponse.java | 2 ++ src/main/resources/schemas/schema_v2.2.sql | 3 +++ 4 files changed, 18 insertions(+) diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java index 19b83f221..f51a2ad9f 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java @@ -99,6 +99,12 @@ public class DeviceInspectTaskEntity implements Serializable { @TableField(value = "type") private Integer type; + @TableField(value = "repairType") + private Integer repairType; + + @TableField(value = "level") + private Integer level; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java index 3d82505ee..240f2a381 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.inv; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -61,4 +62,10 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest { private String yjjsEndDate; + private Integer repairType; + + + + + } diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java b/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java index 3ce7a8062..8f46ade58 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java +++ b/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java @@ -109,6 +109,8 @@ public class DeviceInspectTakeResponse { private String inspectName; private Date expectedTime; private Integer type; + private Integer repairType; + private Integer level; diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index 4ffc83b51..72d6e2edc 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -85,3 +85,6 @@ CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1); CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1); + +CALL Pro_Temp_ColumnWork('device_inspect_task', 'repairType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('device_inspect_task', 'level', 'tinyint', 1);