|
@@ -444,7 +444,7 @@
|
|
|
WHERE
|
|
WHERE
|
|
|
fund.real_amount IS NOT NULL
|
|
fund.real_amount IS NOT NULL
|
|
|
AND mpr.save_file_date IS NOT NULL
|
|
AND mpr.save_file_date IS NOT NULL
|
|
|
- ) mp ON mp.report_no = pf.production_no
|
|
|
|
|
|
|
+ ) mp ON (mp.report_no = pf.production_no and mp.major_id = pf.business_id )
|
|
|
LEFT JOIN major m ON m.id = mp.major_id
|
|
LEFT JOIN major m ON m.id = mp.major_id
|
|
|
LEFT JOIN user u ON u.id = m.principal_id
|
|
LEFT JOIN user u ON u.id = m.principal_id
|
|
|
LEFT JOIN user u1 ON u1.id = m.client_manager_id
|
|
LEFT JOIN user u1 ON u1.id = m.client_manager_id
|
|
@@ -554,7 +554,7 @@
|
|
|
WHERE
|
|
WHERE
|
|
|
fund.real_amount IS NOT NULL
|
|
fund.real_amount IS NOT NULL
|
|
|
AND mpr.delivery_date IS NOT NULL
|
|
AND mpr.delivery_date IS NOT NULL
|
|
|
- ) mp ON mp.report_no = pf.production_no
|
|
|
|
|
|
|
+ ) mp ON (mp.report_no = pf.production_no and mp.major_id = pf.business_id )
|
|
|
LEFT JOIN major m ON m.id = mp.major_id
|
|
LEFT JOIN major m ON m.id = mp.major_id
|
|
|
LEFT JOIN user u ON u.id = m.principal_id
|
|
LEFT JOIN user u ON u.id = m.principal_id
|
|
|
LEFT JOIN user u1 ON u1.id = m.client_manager_id
|
|
LEFT JOIN user u1 ON u1.id = m.client_manager_id
|
