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 8d74a19..e67ad87 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,14 +277,14 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { @Override public List queryByStauts(String status) { -// WQLObject wo = WQLObject.getWQLObject("acs_task"); - HashMap 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); + WQLObject wo = WQLObject.getWQLObject("acs_task"); +// HashMap 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,task_code").getResultJSONArray(0); List list = JSONArray.toList(arr, TaskDto.class); return list; } diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java index 4e741a1..d6e42c3 100644 --- a/hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java @@ -170,6 +170,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService { jo.put("remark", device.getRemark()); jo.put("status_name", move); jo.put("status", status); + jo.put("seq_number", devicejo.optString("seq_num")); jo.put("device_id", devicejo.optString("device_id")); jo.put("device_code", devicejo.optString("device_code")); jo.put("device_name", devicejo.optString("device_name")); @@ -205,6 +206,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService { jo.put("material_type", material); jo.put("status_name", move); jo.put("status", status); + jo.put("seq_number", devicejo.optString("seq_num")); jo.put("device_id", devicejo.optString("device_id")); jo.put("device_code", devicejo.optString("device_code")); jo.put("device_name", devicejo.optString("device_name")); @@ -274,6 +276,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService { jo.put("remark", device.getRemark()); jo.put("status_name", move); jo.put("status", status); + jo.put("seq_number", devicejo.optString("seq_num")); jo.put("device_id", devicejo.optString("device_id")); jo.put("device_code", devicejo.optString("device_code")); jo.put("device_name", devicejo.optString("device_name")); @@ -308,6 +311,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService { jo.put("material_type", material); jo.put("status_name", move); jo.put("status", status); + jo.put("seq_number", devicejo.optString("seq_num")); jo.put("device_id", devicejo.optString("device_id")); jo.put("device_code", devicejo.optString("device_code")); jo.put("device_name", devicejo.optString("device_name")); @@ -377,6 +381,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService { jo.put("remark", device.getRemark()); jo.put("status_name", move); jo.put("status", status); + jo.put("seq_number", devicejo.optString("seq_num")); jo.put("device_id", devicejo.optString("device_id")); jo.put("device_code", devicejo.optString("device_code")); jo.put("device_name", devicejo.optString("device_name")); @@ -412,6 +417,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService { jo.put("material_type", material); jo.put("status_name", move); jo.put("status", status); + jo.put("seq_number", devicejo.optString("seq_num")); jo.put("device_id", devicejo.optString("device_id")); jo.put("device_code", devicejo.optString("device_code")); jo.put("device_name", devicejo.optString("device_name")); @@ -482,6 +488,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService { jo.put("remark", device.getRemark()); jo.put("status_name", move); jo.put("status", status); + jo.put("seq_number", devicejo.optString("seq_num")); jo.put("device_id", devicejo.optString("device_id")); jo.put("device_code", devicejo.optString("device_code")); jo.put("device_name", devicejo.optString("device_name")); @@ -514,6 +521,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService { jo.put("material_type", material); jo.put("status_name", move); jo.put("status", status); + jo.put("seq_number", devicejo.optString("seq_num")); jo.put("device_id", devicejo.optString("device_id")); jo.put("device_code", devicejo.optString("device_code")); jo.put("device_name", devicejo.optString("device_name"));