|
|
@@ -546,7 +546,7 @@
|
|
546
|
546
|
LEFT JOIN business_plan_acceptance c ON c.plan_id=a.id
|
|
547
|
547
|
LEFT JOIN business_plan_acceptance_detail e ON e.acceptance_id=c.id
|
|
548
|
548
|
LEFT JOIN storage_qualitycheck d ON d.id=e.qualitycheck_id
|
|
549
|
|
- WHERE 1=1 AND a.audit_state='2' AND a.execute_type in ('3156','3155') AND a.org_id=#{orgId}
|
|
|
549
|
+ WHERE 1=1 AND a.audit_state='2' AND a.execute_type in ('3156','3155') AND c.acceptance_number is not null AND a.org_id=#{orgId}
|
|
550
|
550
|
UNION ALL
|
|
551
|
551
|
SELECT
|
|
552
|
552
|
e.qualitycheck_id ysId,
|
|
|
@@ -567,7 +567,7 @@
|
|
567
|
567
|
LEFT JOIN business_plan_acceptance c ON c.plan_id=a.id
|
|
568
|
568
|
LEFT JOIN business_plan_acceptance_detail e ON e.acceptance_id=c.id
|
|
569
|
569
|
LEFT JOIN storage_qualitycheck d ON d.id=e.qualitycheck_id
|
|
570
|
|
- WHERE 1=1 AND a.audit_state='2' AND a.execute_type in ('7120','7121') AND a.org_id=#{orgId}
|
|
|
570
|
+ WHERE 1=1 AND a.audit_state='2' AND a.execute_type in ('7120','7121') AND c.acceptance_number is not null AND a.org_id=#{orgId}
|
|
571
|
571
|
UNION ALL
|
|
572
|
572
|
SELECT
|
|
573
|
573
|
e.qualitycheck_id ysId,
|
|
|
@@ -588,7 +588,7 @@
|
|
588
|
588
|
LEFT JOIN business_plan_acceptance c ON c.plan_id=a.id
|
|
589
|
589
|
LEFT JOIN business_plan_acceptance_detail e ON e.acceptance_id=c.id
|
|
590
|
590
|
LEFT JOIN storage_qualitycheck d ON d.id=e.qualitycheck_id
|
|
591
|
|
- WHERE 1=1 AND a.audit_state='2' AND a.execute_type='3154' AND a.org_id=#{orgId}
|
|
|
591
|
+ WHERE 1=1 AND a.audit_state='2' AND a.execute_type='3154' AND c.acceptance_number is not null AND a.org_id=#{orgId}
|
|
592
|
592
|
UNION ALL
|
|
593
|
593
|
SELECT
|
|
594
|
594
|
e.qualitycheck_id ysId,
|
|
|
@@ -609,7 +609,7 @@
|
|
609
|
609
|
LEFT JOIN business_plan_acceptance c ON c.plan_id=a.id
|
|
610
|
610
|
LEFT JOIN business_plan_acceptance_detail e ON e.acceptance_id=c.id
|
|
611
|
611
|
LEFT JOIN storage_qualitycheck d ON d.id=e.qualitycheck_id
|
|
612
|
|
- WHERE 1=1 AND a.audit_state='2' AND a.execute_type='7119' AND a.org_id=#{orgId}
|
|
|
612
|
+ WHERE 1=1 AND a.audit_state='2' AND a.execute_type='7119' AND c.acceptance_number is not null AND a.org_id=#{orgId}
|
|
613
|
613
|
) datas
|
|
614
|
614
|
</select>
|
|
615
|
615
|
|