|
@@ -311,8 +311,10 @@
|
|
|
from (select a.id,a.name ,date_format(b.record_time,'%Y-%m')recordTime
|
|
from (select a.id,a.name ,date_format(b.record_time,'%Y-%m')recordTime
|
|
|
from project_task a left join project_staff_record b on a.id =b.pid
|
|
from project_task a left join project_staff_record b on a.id =b.pid
|
|
|
left join sys_user c on b.aid=c.user_id left join sys_dept d on c.dept_id=d.dept_id
|
|
left join sys_user c on b.aid=c.user_id left join sys_dept d on c.dept_id=d.dept_id
|
|
|
- where d.company_id= #{companyId}
|
|
|
|
|
- )x group by x.id,x.name,x.recordTime
|
|
|
|
|
|
|
+ <if test="companyId !=null">
|
|
|
|
|
+ where d.company_id= #{companyId}
|
|
|
|
|
+ </if>
|
|
|
|
|
+ )x where x.recordTime is not null group by x.id,x.name,x.recordTime
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|