From 73c0951ff5e030263cfb1932491becde4cdfcbb2 Mon Sep 17 00:00:00 2001 From: mx <1289317512@qq.com> Date: Wed, 6 Nov 2024 16:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/HomeServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java index 720e856..0a1f8ae 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java @@ -366,7 +366,7 @@ public class HomeServiceImpl implements HomeService { v.setJieShaoPer("0.00%"); } } - if (BigDecimal.ZERO.equals(daPan.getSumAmount())){ + if (BigDecimal.ZERO.equals(daPan.getSumAmount()) || daPan.getSumAmount().doubleValue() == 0){ daPan.setJieShaoPer("0%"); daPan.setOtherPer("0%"); }else{ @@ -687,12 +687,12 @@ public class HomeServiceImpl implements HomeService { .ge(startDate != null, "create_time", startDate).le(endDate != null, "create_time", endDate) .ge(startDate != null, "finish_date", startDate).le(endDate != null, "finish_date", endDate) .groupBy("appoint_type")); - map.put("taskAvg",allList.get(0).get("avg"));//任务平均天数 - map.put("inAvg",0);//内勤 - map.put("outAvg",0);//外勤 - map.put("secAvg",0);//特勤 - map.put("dateStr",date);// - map.put("currentDate", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm",new Date()));//当前时间 + map.put("taskAvg", allList.isEmpty() || allList.get(0) == null ? 0 : allList.get(0).get("avg"));//任务平均天数 + map.put("inAvg", 0);//内勤 + map.put("outAvg", 0);//外勤 + map.put("secAvg", 0);//特勤 + map.put("dateStr", date);// + map.put("currentDate", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm", new Date()));//当前时间 for(Map appointMap : appointList){ if(StringUtils.equals("1",appointMap.get("appoint_type").toString())){ appointMap.put("inAvg",appointMap.get("avg"));