|
|
@@ -4619,16 +4619,27 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
List<Map<String,Object>> itemList= user.getPersonWorkHoursWages();
|
|
|
Optional<Map<String, Object>> first = itemList.stream().filter(it -> it.get("crateDate").equals(s)).findFirst();
|
|
|
if(first.isPresent()){
|
|
|
- BigDecimal bigDecimal=new BigDecimal(Double.valueOf(String.valueOf(first.get().get("workTime"))));
|
|
|
- list.add(bigDecimal.doubleValue()+"分钟");
|
|
|
- list.add(first.get().get("cost")+"元");
|
|
|
+ BigDecimal workTime=new BigDecimal(Double.valueOf(String.valueOf(first.get().get("workTime"))));
|
|
|
+ BigDecimal cost=new BigDecimal(Double.valueOf(String.valueOf(first.get().get("cost"))));
|
|
|
+ BigDecimal tempWorkTime=new BigDecimal(Double.valueOf(String.valueOf(first.get().get("tempWorkTime"))));
|
|
|
+ BigDecimal tempCost=new BigDecimal(Double.valueOf(String.valueOf(first.get().get("tempCost"))));
|
|
|
+ workTime=workTime.add(tempWorkTime);
|
|
|
+ cost=cost.add(tempCost);
|
|
|
+ list.add(workTime.doubleValue()+"分钟");
|
|
|
+ list.add(cost.doubleValue()+"元");
|
|
|
}else {
|
|
|
list.add("");
|
|
|
list.add("");
|
|
|
}
|
|
|
}
|
|
|
- list.add(user.getTotalResult().substring(0,user.getTotalResult().indexOf("分钟")+3));
|
|
|
- list.add(user.getTotalResult().substring(user.getTotalResult().indexOf("分钟")+2));
|
|
|
+ BigDecimal totalWorkTime = new BigDecimal(Double.valueOf(user.getTotalResult().substring(0, user.getTotalResult().indexOf("分钟") + 3).replace("分钟", "").trim()));
|
|
|
+ BigDecimal totalTempWorkTime = new BigDecimal(Double.valueOf(user.getTotalTempResult().substring(0, user.getTotalTempResult().indexOf("分钟") + 3).replace("分钟", "").trim()));
|
|
|
+ BigDecimal totalCost = new BigDecimal(Double.valueOf(user.getTotalResult().substring(user.getTotalResult().indexOf("分钟") + 2).trim().replace("元", "")));
|
|
|
+ BigDecimal totalTempCost = new BigDecimal(Double.valueOf(user.getTotalTempResult().substring(user.getTotalTempResult().indexOf("分钟") + 2).trim().replace("元", "")));
|
|
|
+ totalWorkTime=totalWorkTime.add(totalTempWorkTime);
|
|
|
+ totalCost=totalCost.add(totalTempCost);
|
|
|
+ list.add(totalWorkTime.doubleValue()+"分钟");
|
|
|
+ list.add(totalCost.doubleValue()+"元");
|
|
|
}
|
|
|
int k=0;
|
|
|
for(int i = 0;i<mapList.size();i++){
|
Min