From 300acfb9986a3e973498f7f840a5536d649c8ebb Mon Sep 17 00:00:00 2001
From: loujf <loujingfei666@163.com>
Date: Mon, 19 Sep 2022 15:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E7=94=9F=E6=88=90=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/service/impl/TaskServiceImpl.java    | 10 ++++++++--
 .../nl/acs/task/service/wql/QTASK_QUERY.wql   | 20 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 556406c..8d74a19 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -277,8 +277,14 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
 
     @Override
     public List<TaskDto> queryByStauts(String status) {
-        WQLObject wo = WQLObject.getWQLObject("acs_task");
-        JSONArray arr = wo.query("task_status = '" + status + "'","create_time,start_device_code").getResultJSONArray(0);
+//        WQLObject wo = WQLObject.getWQLObject("acs_task");
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "3");
+        if (!StrUtil.isEmpty(status)) {
+            map.put("status", status);
+        }
+        JSONArray arr = WQL.getWO("QTASK_QUERY").addParamMap(map).process().getResultJSONArray(0);
+//        JSONArray arr = wo.query("task_status = '" + status + "'","create_time,start_device_code").getResultJSONArray(0);
         List<TaskDto> list = JSONArray.toList(arr, TaskDto.class);
         return list;
     }
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql
index dbd0efd..17ee6e6 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql
@@ -112,4 +112,22 @@ IF 输入.flag = "2"
         ENDOPTION
 		ENDSELECT
 	ENDPAGEQUERY
- ENDIF
\ No newline at end of file
+ ENDIF
+
+ IF 输入.flag = "3"
+ 	PAGEQUERY
+         SELECT
+         	*
+         FROM
+         	acs_task task
+         	LEFT JOIN acs_device device ON task.start_point_code = device.device_code
+         WHERE
+         	1 = 1
+         	OPTION 输入.status <> ""
+                                task.task_status = 输入.status
+                   ENDOPTION
+         ORDER BY
+         	device.seq_num
+ 		ENDSELECT
+ 	ENDPAGEQUERY
+  ENDIF
\ No newline at end of file