From cc9b5e19e9f601a9282ed3a7cc6cbab278ec826a Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 8 May 2023 14:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DepositoryController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index 8167fe0e..8a67d42c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -1,5 +1,6 @@ package com.dreamchaser.depository_manage.controller; +import com.alibaba.excel.util.ListUtils; import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.pojo.*; @@ -425,7 +426,8 @@ public class DepositoryController { show_data.putAll((Map) result); } depository_data.put("data", show_data); - } else { + } + else { // 定义线程 int threadSize = depositoryAllNameAndId.size(); ExecutorService exs = new ThreadPoolExecutor(threadSize, threadSize, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(threadSize)); @@ -1497,10 +1499,11 @@ public class DepositoryController { for (i = days.size() - 1; i > 0; i--) { // 遍历 Map并计算各仓库的入库数 // 获取一段时间内的库存额度 - Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i - 1), days.get(i), Integer.parseInt(type), val); + Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i), days.get(i-1), Integer.parseInt(type), val); drCountbyDrName.add(depositoryRecordByDate1); } - map.put("data", drCountbyDrName); + Collections.reverse(drCountbyDrName); + map.put("data",drCountbyDrName); result.put(val, map); return result; }