From 882d4dcc7e009b5f5391d2af2dc66166a2459656 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 三月 2022 14:53:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/TaskDto.java | 6 ++++++
src/main/java/com/zy/asrs/controller/OutController.java | 3 +--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 01d6dbb..94bc842 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -113,7 +113,7 @@
List<TaskDto> taskDtos = new ArrayList<>();
for (LocDto locDto : locDtos) {
if (locDto.isLack()) { continue; }
- TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), Collections.singletonList(locDto));
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
assert dto != null;
@@ -122,7 +122,6 @@
taskDtos.add(taskDto);
}
}
- System.out.println(JSON.toJSONString(locDtos));
return R.ok();
}
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 02f1d74..c2e8223 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -27,6 +27,12 @@
this.staNo = staNo;
}
+ public TaskDto(String locNo, Integer staNo, LocDto locDto) {
+ this.locNo = locNo;
+ this.staNo = staNo;
+ this.locDtos.add(locDto);
+ }
+
public TaskDto(String locNo, Integer staNo, List<LocDto> locDtos) {
this.locNo = locNo;
this.staNo = staNo;
--
Gitblit v1.9.1