统计bug
This commit is contained in:
parent
a5d565ca97
commit
73c0951ff5
@ -366,7 +366,7 @@ public class HomeServiceImpl implements HomeService {
|
|||||||
v.setJieShaoPer("0.00%");
|
v.setJieShaoPer("0.00%");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (BigDecimal.ZERO.equals(daPan.getSumAmount())){
|
if (BigDecimal.ZERO.equals(daPan.getSumAmount()) || daPan.getSumAmount().doubleValue() == 0){
|
||||||
daPan.setJieShaoPer("0%");
|
daPan.setJieShaoPer("0%");
|
||||||
daPan.setOtherPer("0%");
|
daPan.setOtherPer("0%");
|
||||||
}else{
|
}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, "create_time", startDate).le(endDate != null, "create_time", endDate)
|
||||||
.ge(startDate != null, "finish_date", startDate).le(endDate != null, "finish_date", endDate)
|
.ge(startDate != null, "finish_date", startDate).le(endDate != null, "finish_date", endDate)
|
||||||
.groupBy("appoint_type"));
|
.groupBy("appoint_type"));
|
||||||
map.put("taskAvg",allList.get(0).get("avg"));//任务平均天数
|
map.put("taskAvg", allList.isEmpty() || allList.get(0) == null ? 0 : allList.get(0).get("avg"));//任务平均天数
|
||||||
map.put("inAvg",0);//内勤
|
map.put("inAvg", 0);//内勤
|
||||||
map.put("outAvg",0);//外勤
|
map.put("outAvg", 0);//外勤
|
||||||
map.put("secAvg",0);//特勤
|
map.put("secAvg", 0);//特勤
|
||||||
map.put("dateStr",date);//
|
map.put("dateStr", date);//
|
||||||
map.put("currentDate", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm",new Date()));//当前时间
|
map.put("currentDate", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm", new Date()));//当前时间
|
||||||
for(Map<String, Object> appointMap : appointList){
|
for(Map<String, Object> appointMap : appointList){
|
||||||
if(StringUtils.equals("1",appointMap.get("appoint_type").toString())){
|
if(StringUtils.equals("1",appointMap.get("appoint_type").toString())){
|
||||||
appointMap.put("inAvg",appointMap.get("avg"));
|
appointMap.put("inAvg",appointMap.get("avg"));
|
||||||
|
Loading…
Reference in New Issue
Block a user