From e40c6c9b0fcfdb4018901aca1a147a39f549bdfd Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Thu, 2 Mar 2023 10:11:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InstructionServiceImpl.java | 3 +++ .../nl/acs/instruction/service/wql/QINST_QUERY.wql | 4 ++++ .../org/nl/acs/task/service/wql/QTASK_QUERY.wql | 4 ++++ .../src/views/acs/history/instRecord/index.vue | 14 +++++++++----- .../src/views/acs/history/taskRecord/index.vue | 14 +++++++++----- .../src/views/acs/history/taskTreeRecord/index.vue | 11 +++++++---- 6 files changed, 36 insertions(+), 14 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index c93ae2124..b569116fd 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -189,9 +189,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu JSONObject ins = new JSONObject(); ins.put("task_id", jo.get("instruction_id")); ins.put("task_code", jo.get("instruction_code")); + ins.put("task_type", jo.get("instruction_type")); ins.put("task_status", jo.get("instruction_status")); ins.put("start_point_code", jo.get("start_point_code")); + ins.put("start_point_code2", jo.get("start_point_code2")); ins.put("next_point_code", jo.get("next_point_code")); + ins.put("next_point_code2", jo.get("next_point_code2")); ins.put("matarial", jo.get("matarial")); ins.put("remark", jo.get("remark")); ins.put("create_by", jo.get("create_by")); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql index 4b39fdfa5..9b7b0bae7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/wql/QINST_QUERY.wql @@ -81,6 +81,10 @@ inst.start_point_code LIKE CONCAT ( '%', 输入.point_code, '%' ) OR inst.next_point_code LIKE CONCAT ( '%', 输入.point_code, '%' ) + OR + inst.start_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%' ) + OR + inst.next_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%' ) ) ENDOPTION OPTION 输入.instruction_type <> "" diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql index fac35ef90..583e75e99 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql @@ -105,6 +105,10 @@ IF 输入.flag = "2" task.start_point_code LIKE CONCAT ( '%', 输入.point_code, '%' ) OR task.next_point_code LIKE CONCAT ( '%', 输入.point_code, '%') + OR + task.start_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%' ) + OR + task.next_point_code2 LIKE CONCAT ( '%', 输入.point_code, '%') ) ENDOPTION OPTION 输入.create_time <> "" diff --git a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue index 6dc37822b..935da3147 100644 --- a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue @@ -99,16 +99,20 @@ + + + + + @@ -167,7 +171,7 @@ const defaultForm = { update_time: null } export default { - dicts: ['task_status'], + dicts: ['task_status', 'task_type'], name: 'Instruction', components: { pagination, crudOperation, Search }, mixins: [presenter(), header(), form(defaultForm), crud()], diff --git a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue index 9fade6d65..44449b4cb 100644 --- a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue @@ -232,17 +232,21 @@ + + + + + @@ -288,7 +292,7 @@ const defaultForm = { export default { name: 'Task', components: { pagination, crudOperation, Search }, - dicts: ['task_status'], + dicts: ['task_status', 'task_type'], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ diff --git a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue index ac8fd5113..e49dd0b84 100644 --- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue @@ -89,11 +89,14 @@ + + + @@ -138,7 +141,7 @@ const defaultForm = { export default { name: 'Task', components: { pagination, crudOperation, Search }, - dicts: ['task_status'], + dicts: ['task_status', 'task_type'], mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ title: '任务', url: 'api/task/getAll', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask }, optShow: {