|
@@ -174,7 +174,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
totalWorkingTime += timeCalculation.getDuration();
|
|
totalWorkingTime += timeCalculation.getDuration();
|
|
}
|
|
}
|
|
//把总秒数转为double后换算为小时并保留两位小数
|
|
//把总秒数转为double后换算为小时并保留两位小数
|
|
- resultMap.put("time", new DecimalFormat("#.00").format((double) totalWorkingTime / 3600));
|
|
|
|
|
|
+ resultMap.put("time", new DecimalFormat("0.00").format((double) totalWorkingTime / 3600));
|
|
//顺便返回该公司全部的计划
|
|
//顺便返回该公司全部的计划
|
|
resultMap.put("project", projectMapper.selectList(new QueryWrapper<Project>()
|
|
resultMap.put("project", projectMapper.selectList(new QueryWrapper<Project>()
|
|
.eq("company_id", userMapper.selectById(userId).getCompanyId())));
|
|
.eq("company_id", userMapper.selectById(userId).getCompanyId())));
|