From 46d9995ba798ac51badae72e11513fe681c4a298 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 20 六月 2023 11:14:32 +0800
Subject: [PATCH] 更新校验对比数据数量并切割
---
src/main/java/com/whyc/service/ExcelExportService.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index 4991aa4..af15a8d 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -205,11 +205,24 @@
List<BattgroupData> dataList = (List<BattgroupData>) comparedList.getData();
List<BattgroupData> dataList2 = (List<BattgroupData>) comparedList.getData2();
Map<String,List<String>> data3 = (Map<String, List<String>>) comparedList.getData3();
+
+ int baseSize = dataList.size();
+ int size = dataList2.size();
+ if(baseSize > size){
+ dataList = dataList.subList(0,size);
+ }else{
+ dataList2 = dataList2.subList(0,baseSize);
+ }
+
+
//鍙樺寲鐜�
List<String> resChangeRateList = data3.get("resChangeRate");
List<String> volChangeRateList = data3.get("volChangeRate");
- map.put("resChangeRateList",resChangeRateList.subList(0,resChangeRateList.size()-1));
- map.put("volChangeRateList",volChangeRateList.subList(0,volChangeRateList.size()-1));
+ /*map.put("resChangeRateList",resChangeRateList.subList(0,resChangeRateList.size()-1));
+ map.put("volChangeRateList",volChangeRateList.subList(0,volChangeRateList.size()-1));*/
+
+ map.put("resChangeRateList",resChangeRateList);
+ map.put("volChangeRateList",volChangeRateList);
map.put("volBalanceRateChangeRate",volChangeRateList.get(volChangeRateList.size()-1));
map.put("resBalanceRateChangeRate",resChangeRateList.get(resChangeRateList.size()-1));
--
Gitblit v1.9.1