|
|
|
@ -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; |
|
|
|
} |
|
|
|
|