From 30ba88092221aa34c9a344e5c9c3891a7ed50daa Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期一, 20 四月 2026 22:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lggslasrs' into lggslasrs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 78eb7aa..4e1f501 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -823,6 +823,7 @@
ArrayList<Integer> data2 = new ArrayList<>();
ArrayList<Double> data3 = new ArrayList<>();
ArrayList<Double> data4 = new ArrayList<>();
+ ArrayList<Double> data5 = new ArrayList<>();
List<String> categories = new ArrayList<>();
final int n = 12;
@@ -841,12 +842,14 @@
int outV = 0;
double inC = 0;
double outC = 0;
+ double outD = 0;
for (WorkChartAxis w : listChart) {
if (w.getYmd() != null && key.equals(w.getYmd().trim())) {
inV = w.getInqty();
outV = w.getOutqty();
inC = w.getCubeInqty();
outC = w.getCubeOutqty();
+ outD = w.getOutTeu();
break;
}
}
@@ -854,6 +857,7 @@
data2.add(outV);
data3.add(inC);
data4.add(outC);
+ data5.add(outD);
calendar.add(Calendar.HOUR_OF_DAY, 1);
}
@@ -872,18 +876,28 @@
if (data3.size() >0) {
AxisBean cubeInqty = new AxisBean();
cubeInqty.setName("鍏ュ簱浣撶Н");
- Integer[] array3 = new Integer[data3.size()];
+ Double [] array3 = new Double[data3.size()];
cubeInqty.setData(data3.toArray(array3));
list.add(cubeInqty);
}
- if (data3.size() >0) {
+ if (data4.size() >0) {
AxisBean cubeOutqty = new AxisBean();
cubeOutqty.setName("鍑哄簱浣撶Н");
- Integer[] array4 = new Integer[data4.size()];
+ Double[] array4 = new Double[data4.size()];
cubeOutqty.setData(data4.toArray(array4));
list.add(cubeOutqty);
}
+
+ if (data5.size() >0) {
+ AxisBean cubeOutqty = new AxisBean();
+ cubeOutqty.setName("鍑哄簱TEU");
+ Double[] array5 = new Double[data4.size()];
+ cubeOutqty.setData(data5.toArray(array5));
+ list.add(cubeOutqty);
+ }
+
+
map.put("categories", categories);
map.put("rows", list);
return R.ok(map);
--
Gitblit v1.9.1