|
@@ -11365,8 +11365,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
Report report = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").eq("project_id", projectId).and(i->i.eq("state", 0).or().eq("state", 1)));
|
|
Report report = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").eq("project_id", projectId).and(i->i.eq("state", 0).or().eq("state", 1)));
|
|
Report waiting = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").eq("project_id", projectId).eq("state", 0));
|
|
Report waiting = reportMapper.selectOne(new QueryWrapper<Report>().select("sum(working_time) as working_time").eq("project_id", projectId).eq("state", 0));
|
|
HashMap map = new HashMap();
|
|
HashMap map = new HashMap();
|
|
- map.put("total",report.getWorkingTime());
|
|
|
|
- map.put("waiting",waiting.getWorkingTime());
|
|
|
|
|
|
+ map.put("total",report == null?0:report.getWorkingTime());
|
|
|
|
+ map.put("waiting",waiting==null?0:waiting.getWorkingTime());
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
msg.setData(map);
|
|
msg.setData(map);
|
|
return msg;
|
|
return msg;
|