root/niuDiXiYa2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

指令生成排序

Browse Source
This commit is contained in:
loujf
2022-09-19 15:23:40 +08:00
parent ed426d4fa5
commit 300acfb998
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -277,8 +277,14 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override @Override
public List<TaskDto> queryByStauts(String status) { public List<TaskDto> queryByStauts(String status) {
WQLObject wo = WQLObject.getWQLObject("acs_task"); // WQLObject wo = WQLObject.getWQLObject("acs_task");
JSONArray arr = wo.query("task_status = '" + status + "'","create_time,start_device_code").getResultJSONArray(0); 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); List<TaskDto> list = JSONArray.toList(arr, TaskDto.class);
return list; return list;
} }

18
hd/nladmin-system/src/main/java/org/nl/acs/task/service/wql/QTASK_QUERY.wql
View File

@@ -113,3 +113,21 @@ IF 输入.flag = "2"
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
ENDIF 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