From 8ef7153a44f16d6874bf38c6dca3b4a49d00becf Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 02 Sep 2024 14:49:50 +0800
Subject: [PATCH] fix:业务汇总时间修改提交
---
screen-api/src/main/java/com/moral/api/controller/YcReptilesController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/YcReptilesController.java b/screen-api/src/main/java/com/moral/api/controller/YcReptilesController.java
index deac313..326b925 100644
--- a/screen-api/src/main/java/com/moral/api/controller/YcReptilesController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/YcReptilesController.java
@@ -207,6 +207,9 @@
if(it.getName().equals("���������(���)")){
it.setName("���������");
}
+ if(it.getName().equals("������������������(���)")){
+ it.setName("������������������");
+ }
});
List<AqiResultVo> listG = list.stream().filter(it->yc.contains(it.getName())).collect(Collectors.toList());
List<AqiResultVo> listG1 = list.stream().filter(it->!yc.contains(it.getName())&&!it.getName().equals("������")).collect(Collectors.toList());
@@ -295,8 +298,17 @@
map.put("title1",map0.get("title"));
excelWriter1.fill(map, writeSheet4);
List<AqiResultVo> list0 = (List<AqiResultVo>) map0.get("table");
+ list0.forEach(it->{
+ if(it.getName().equals("���������(���)")){
+ it.setName("���������");
+ }
+ if(it.getName().equals("������������������(���)")){
+ it.setName("������������������");
+ }
+ });
+ List<AqiResultVo> list00 = list0.stream().filter(it->!yc.contains(it.getName())&&!it.getName().equals("������")).collect(Collectors.toList());
excelWriter1.fill(new FillWrapper("data",listG1),fillConfig, writeSheet4);
- excelWriter1.fill(new FillWrapper("data0",list0),fillConfig, writeSheet4);
+ excelWriter1.fill(new FillWrapper("data0",list00),fillConfig, writeSheet4);
//map1.put("title1",map2.get("title"));
excelWriter1.fill(map1, writeSheet5);
excelWriter1.fill(new FillWrapper("data1",list1G1),fillConfig, writeSheet5);
@@ -661,7 +673,7 @@
if(6 == type){
topThreeNum.append("���");
}else {
- topThreeNum.append(";");
+ topThreeNum.append("���");
}
}
--
Gitblit v1.8.0