|
@@ -1926,7 +1926,7 @@
|
|
left join task t on t.id=te.task_id
|
|
left join task t on t.id=te.task_id
|
|
left join project p on p.id=t.project_id
|
|
left join project p on p.id=t.project_id
|
|
left join project_category pc on pc.id=p.category
|
|
left join project_category pc on pc.id=p.category
|
|
- where u.company_id=#{companyId} and te.project_id is not null and pc.name in ('报价项目','售后报价项目','售后工程项目','工程项目')
|
|
|
|
|
|
+ where u.company_id=#{companyId} and te.project_id is not null and pc.name not in ('报价项目','售后报价项目','研发项目')
|
|
<if test="projectId!=null">
|
|
<if test="projectId!=null">
|
|
and p.id=#{projectId}
|
|
and p.id=#{projectId}
|
|
</if>
|
|
</if>
|
|
@@ -1957,7 +1957,7 @@
|
|
left join task t on t.id=te.task_id
|
|
left join task t on t.id=te.task_id
|
|
left join project p on p.id=t.project_id
|
|
left join project p on p.id=t.project_id
|
|
left join project_category pc on pc.id=p.category
|
|
left join project_category pc on pc.id=p.category
|
|
- where u.company_id=#{companyId} and te.project_id is not null and pc.name in ('报价项目','售后报价项目','售后工程项目','工程项目')
|
|
|
|
|
|
+ where u.company_id=#{companyId} and te.project_id is not null and pc.name not in ('报价项目','售后报价项目','研发项目')
|
|
<if test="projectId!=null">
|
|
<if test="projectId!=null">
|
|
and p.id=#{projectId}
|
|
and p.id=#{projectId}
|
|
</if>
|
|
</if>
|