moral.git - Gitblit

			@@ -133,7 +133,7 @@
			Map<String,Object> map0 = resultService.getYcDaily(url,cookie,DateUtils.dateToDateString(DateUtils.getFirstDayOfLastYear(endDate),DateUtils.yyyy_MM_dd_EN),2);


			Date dateTime = DateUtils.getFirstDayOfMonth(resultDate);
			Date dateTime = DateUtils.getFirstDayOfMonth(endDate);

			String sTime = DateUtils.dateToDateString(dateTime);
			String eTime = endDateTime+" 00:00:00";
			@@ -203,6 +203,14 @@
			// map.put("dd", list);

			List<AqiResultVo> list = (List<AqiResultVo>) map.get("table");
			list.forEach(it->{
			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());

			@@ -290,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);
			@@ -656,7 +673,7 @@
			if(6 == type){
			topThreeNum.append("。");
			}else {
			topThreeNum.append(";");
			topThreeNum.append("；");
			}

			}