|
@@ -255,7 +255,7 @@
|
|
|
LEFT JOIN prod_procedure pp ON ppt.prod_procedure_id=pp.id
|
|
LEFT JOIN prod_procedure pp ON ppt.prod_procedure_id=pp.id
|
|
|
LEFT JOIN product p ON p.id=plan.product_id
|
|
LEFT JOIN product p ON p.id=plan.product_id
|
|
|
WHERE ppt2.company_id=#{companyId}
|
|
WHERE ppt2.company_id=#{companyId}
|
|
|
- AND r.sumReport < ppt2.work_time AND ppt.total_progress < 100
|
|
|
|
|
|
|
+ AND IFNULL(r.sumReport,0) < ppt2.work_time AND ppt.total_progress < 100
|
|
|
<if test="date!=null and date!=''">
|
|
<if test="date!=null and date!=''">
|
|
|
and ppt2.distribute_date=#{date}
|
|
and ppt2.distribute_date=#{date}
|
|
|
</if>
|
|
</if>
|
Min