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-27 14:27:51 +08:00
parent 300acfb998
commit ffd29731fd
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,14 +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");
HashMap<String, String> map = new HashMap<>(); // HashMap<String, String> map = new HashMap<>();
map.put("flag", "3"); // map.put("flag", "3");
if (!StrUtil.isEmpty(status)) { // if (!StrUtil.isEmpty(status)) {
map.put("status", status); // map.put("status", status);
} // }
JSONArray arr = WQL.getWO("QTASK_QUERY").addParamMap(map).process().getResultJSONArray(0); // 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); JSONArray arr = wo.query("task_status = '" + status + "'","create_time,task_code").getResultJSONArray(0);
List<TaskDto> list = JSONArray.toList(arr, TaskDto.class); List<TaskDto> list = JSONArray.toList(arr, TaskDto.class);
return list; return list;
} }

8
hd/nladmin-system/src/main/java/org/nl/hand/ndxytwo/service/impl/NdxyTwoHandServiceImpl.java
View File

@@ -170,6 +170,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
jo.put("remark", device.getRemark()); jo.put("remark", device.getRemark());
jo.put("status_name", move); jo.put("status_name", move);
jo.put("status", status); jo.put("status", status);
jo.put("seq_number", devicejo.optString("seq_num"));
jo.put("device_id", devicejo.optString("device_id")); jo.put("device_id", devicejo.optString("device_id"));
jo.put("device_code", devicejo.optString("device_code")); jo.put("device_code", devicejo.optString("device_code"));
jo.put("device_name", devicejo.optString("device_name")); jo.put("device_name", devicejo.optString("device_name"));
@@ -205,6 +206,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
jo.put("material_type", material); jo.put("material_type", material);
jo.put("status_name", move); jo.put("status_name", move);
jo.put("status", status); jo.put("status", status);
jo.put("seq_number", devicejo.optString("seq_num"));
jo.put("device_id", devicejo.optString("device_id")); jo.put("device_id", devicejo.optString("device_id"));
jo.put("device_code", devicejo.optString("device_code")); jo.put("device_code", devicejo.optString("device_code"));
jo.put("device_name", devicejo.optString("device_name")); jo.put("device_name", devicejo.optString("device_name"));
@@ -274,6 +276,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
jo.put("remark", device.getRemark()); jo.put("remark", device.getRemark());
jo.put("status_name", move); jo.put("status_name", move);
jo.put("status", status); jo.put("status", status);
jo.put("seq_number", devicejo.optString("seq_num"));
jo.put("device_id", devicejo.optString("device_id")); jo.put("device_id", devicejo.optString("device_id"));
jo.put("device_code", devicejo.optString("device_code")); jo.put("device_code", devicejo.optString("device_code"));
jo.put("device_name", devicejo.optString("device_name")); jo.put("device_name", devicejo.optString("device_name"));
@@ -308,6 +311,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
jo.put("material_type", material); jo.put("material_type", material);
jo.put("status_name", move); jo.put("status_name", move);
jo.put("status", status); jo.put("status", status);
jo.put("seq_number", devicejo.optString("seq_num"));
jo.put("device_id", devicejo.optString("device_id")); jo.put("device_id", devicejo.optString("device_id"));
jo.put("device_code", devicejo.optString("device_code")); jo.put("device_code", devicejo.optString("device_code"));
jo.put("device_name", devicejo.optString("device_name")); jo.put("device_name", devicejo.optString("device_name"));
@@ -377,6 +381,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
jo.put("remark", device.getRemark()); jo.put("remark", device.getRemark());
jo.put("status_name", move); jo.put("status_name", move);
jo.put("status", status); jo.put("status", status);
jo.put("seq_number", devicejo.optString("seq_num"));
jo.put("device_id", devicejo.optString("device_id")); jo.put("device_id", devicejo.optString("device_id"));
jo.put("device_code", devicejo.optString("device_code")); jo.put("device_code", devicejo.optString("device_code"));
jo.put("device_name", devicejo.optString("device_name")); jo.put("device_name", devicejo.optString("device_name"));
@@ -412,6 +417,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
jo.put("material_type", material); jo.put("material_type", material);
jo.put("status_name", move); jo.put("status_name", move);
jo.put("status", status); jo.put("status", status);
jo.put("seq_number", devicejo.optString("seq_num"));
jo.put("device_id", devicejo.optString("device_id")); jo.put("device_id", devicejo.optString("device_id"));
jo.put("device_code", devicejo.optString("device_code")); jo.put("device_code", devicejo.optString("device_code"));
jo.put("device_name", devicejo.optString("device_name")); jo.put("device_name", devicejo.optString("device_name"));
@@ -482,6 +488,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
jo.put("remark", device.getRemark()); jo.put("remark", device.getRemark());
jo.put("status_name", move); jo.put("status_name", move);
jo.put("status", status); jo.put("status", status);
jo.put("seq_number", devicejo.optString("seq_num"));
jo.put("device_id", devicejo.optString("device_id")); jo.put("device_id", devicejo.optString("device_id"));
jo.put("device_code", devicejo.optString("device_code")); jo.put("device_code", devicejo.optString("device_code"));
jo.put("device_name", devicejo.optString("device_name")); jo.put("device_name", devicejo.optString("device_name"));
@@ -514,6 +521,7 @@ public class NdxyTwoHandServiceImpl implements NdxyTwoHandService {
jo.put("material_type", material); jo.put("material_type", material);
jo.put("status_name", move); jo.put("status_name", move);
jo.put("status", status); jo.put("status", status);
jo.put("seq_number", devicejo.optString("seq_num"));
jo.put("device_id", devicejo.optString("device_id")); jo.put("device_id", devicejo.optString("device_id"));
jo.put("device_code", devicejo.optString("device_code")); jo.put("device_code", devicejo.optString("device_code"));
jo.put("device_name", devicejo.optString("device_name")); jo.put("device_name", devicejo.optString("device_name"));