From 8a2cd3fc259d6f118be291ca787fed1a141341ea Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 20:41:22 +0800
Subject: [PATCH] 电视机数据对接
---
src/main/java/com/zy/asrs/controller/OpenController.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 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 63a7a86..ace2e17 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -727,10 +727,21 @@
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱TU");
+ outqty.setName("鍑哄簱鎵樼洏鏁�");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
+
+ AxisBean teu= new AxisBean();
+ teu.setName("TEU");
+ List<WorkTeuTotalAxis> workTeuTotalAxes = reportQueryMapper.getteuTotal();
+ ArrayList<Integer> data3 = new ArrayList<>();
+ for (WorkTeuTotalAxis w : workTeuTotalAxes) {
+ data3.add(w.getTeu_total());
+ }
+ Integer[] array3 = new Integer[data3.size()];
+ teu.setData(data3.toArray(array3));
+ list.add(teu);
}
map.put("rows",list);
return R.ok(map);
@@ -786,7 +797,7 @@
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱TU");
+ outqty.setName("鍑哄簱鎵樼洏鏁�");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
@@ -872,8 +883,25 @@
map.put("taskNo", param.getTaskNo());
map.put("ioType", wrkMast.getIoType());
map.put("costTime", costTime);
+ map.put("costTimeStr", costTime);
map.put("wrkDetls", wrkDetls);
-
+ Integer count = 0;
+ String supp = "";
+ //璇ヨ鍗曠疮璁″叆搴撲欢鏁�
+ if(wrkMast.getIoType()<100){
+ List<WrkMast> orderNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()));
+ if (orderNo != null && orderNo.size() > 0) {
+ count = orderNo.size();
+ }
+ List<WrkMastLog> userNo = wrkMastLogService.selectList(new EntityWrapper<WrkMastLog>().eq("user_no", wrkMast.getUserNo()));
+ if (userNo != null && userNo.size() > 0) {
+ count = userNo.size()+count;
+ }
+ supp = count + "";
+ }else {
+ supp = wrkDetls.get(0).getSupp();
+ }
+ map.put("supp", supp);
return R.ok().add(map);
}
--
Gitblit v1.9.1