|
|
@@ -92,6 +92,8 @@ public class ProjectServiceImpl extends ZtBaseServiceImpl<ProjectEntity, Long> i
|
|
|
builder.append("select ROUND(sum(b.consumed),0) as pcs, d.name as groupKey from zt_task a left join zt_taskestimate b on a.id=b.task LEFT JOIN zt_user c on c.account=a.lastEditedBy left join zt_dept d on d.id=c.dept");
|
|
|
builder.append(" where a.project=").append(param.getId());
|
|
|
builder.append(" and a.deleted='0'");
|
|
|
+ // 2023-6-2 避免指派了任务， 但还没填写工时导致返回前端出现空数据
|
|
|
+ builder.append(" and a.consumed > 0");
|
|
|
String startTime = param.getStartTime();
|
|
|
String endTime = param.getEndTime();
|
|
|
if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)){
|
wuweihao