From e6b89730ba21ff9ab03f9fafb976afbbccd48312 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 30 Aug 2023 16:55:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=8F=AF=E6=89=93=E5=8D=B0=EF=BC=8C=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeController.java | 1 - .../api/controller/sync/TestController.java | 1 + .../service/inout/impl/IoOrderServiceImpl.java | 2 +- src/main/resources/schemas/schema_v2.2.sql | 17 +++++++++++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 3f509826..554f05d5 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -215,7 +215,6 @@ public class BasicBussinessTypeController extends BaseController { } } } - } } else { result.addAll(bussinessTypeEntities); diff --git a/src/main/java/com/glxp/api/controller/sync/TestController.java b/src/main/java/com/glxp/api/controller/sync/TestController.java index 4c63bbe2..15c07b87 100644 --- a/src/main/java/com/glxp/api/controller/sync/TestController.java +++ b/src/main/java/com/glxp/api/controller/sync/TestController.java @@ -3,6 +3,7 @@ package com.glxp.api.controller.sync; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; +import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 937b82c7..bb5beacb 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -671,7 +671,7 @@ public class IoOrderServiceImpl implements IoOrderService { break; case Constant.ORDER_STATUS_INCODE: - filterOrderRequest.setStatuses(Arrays.asList(1, 3)); +// filterOrderRequest.setStatuses(Arrays.asList(1, 3)); filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4)); break; case Constant.ORDER_STATUS_WAIT_AUDITED: diff --git a/src/main/resources/schemas/schema_v2.2.sql b/src/main/resources/schemas/schema_v2.2.sql index e0e27d66..1246b092 100644 --- a/src/main/resources/schemas/schema_v2.2.sql +++ b/src/main/resources/schemas/schema_v2.2.sql @@ -136,3 +136,20 @@ CREATE TABLE IF NOT EXISTS `device_project_set` CALL Pro_Temp_ColumnWork('device_inspect_task', 'id', 'bigint', 2); CALL Pro_Temp_ColumnWork('device_inspect_task_detail', 'id', 'bigint', 2); + + +INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, + `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, + `create_time`, `update_by`, `update_time`, `remark`) +VALUES (1888, '任务查询', 2004, 9, 'inventory/DeviceInspectTakeSelect', 'inventory/DeviceInspectTakeSelect', NULL, 1, 0, + 'C', '0', '0', NULL, NULL, '超级用户', '2023-08-07 16:02:36', NULL, NULL, NULL); +INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, + `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, + `create_time`, `update_by`, `update_time`, `remark`) +VALUES (1889, '我的任务', 2004, 4, 'inventory/DeviceInspectTake', 'inventory/DeviceInspectTake', NULL, 1, 0, 'C', '0', '0', + NULL, NULL, '超级用户', '2023-08-08 14:50:39', NULL, NULL, NULL); +INSERT ignore INTO `auth_menu`(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, + `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, + `create_time`, `update_by`, `update_time`, `remark`) +VALUES (2004, '任务管理', 1703, 5, 'taskManage', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-08-18 14:40:53', + NULL, NULL, NULL);