diff --git a/db/统计视图（新）.sql b/db/统计视图（新）.sql index 4b832f9f..fb426024 100644 --- a/db/统计视图（新）.sql +++ b/db/统计视图（新）.sql @@ -303,18 +303,17 @@ from (SELECT pwgs.id, vmbp.no_tax_amount as invoiceNoTaxAmount, vcpr.no_tax_amount as confirmNoTaxAmount, (select GROUP_CONCAT(DISTINCT pwgsc.contacts_temporary_name order by pwgsc.contacts_temporary_name) from pay_working_group_subitem_contacts pwgsc where pwgsc.working_group_sub_id = pwgs.id) as contactsName, - DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, - pwgs.create_time as createTime + vcpr.payment_date as confirmDate, + pwgs.create_time as createTime FROM pay_working_group pwg right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id) left JOIN sys_user su on (pwg.principal_id_a = su.id) left join sys_depart sd on (su.depart_ids = sd.id) left JOIN pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pwgs.id - left join pay_confirm_payment_record pcpr on pwgs.id = pcpr.project_id left join v_confirm_payment_record vcpr on pwgs.id = vcpr.project_id left join v_payment_record vpr on pwgs.id = vpr.project_id left join v_mail_bill_project vmbp on pwgs.id = vmbp.project_id - group by pwgs.id,pcpr.id + group by pwgs.id union all SELECT pcp.id, pcp.id as superId, @@ -341,16 +340,15 @@ from (SELECT pwgs.id, vmbp.no_tax_amount as invoiceNoTaxAmount, vcpr.no_tax_amount as confirmNoTaxAmount, contacts_temporary_name as contactsName, - DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + vcpr.payment_date as confirmDate, pcp.create_time as createTime FROM pay_common_project pcp left JOIN sys_user su on (pcp.principal_id = su.id) left join sys_depart sd on (su.depart_ids = sd.id) - left join pay_confirm_payment_record pcpr on pcp.id = pcpr.project_id left join v_confirm_payment_record vcpr on pcp.id = vcpr.project_id left join v_payment_record vpr on pcp.id = vpr.project_id left join v_mail_bill_project vmbp on pcp.id = vmbp.project_id - group by pcp.id,pcpr.id + group by pcp.id union all SELECT pmps.id, pmp.id as superId, @@ -377,17 +375,16 @@ from (SELECT pwgs.id, vmbp.no_tax_amount as invoiceNoTaxAmount, vcpr.no_tax_amount as confirmNoTaxAmount, company_contact_name as contactsName, - DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + vcpr.payment_date as confirmDate, pmps.create_time as createTime FROM pay_member_project pmp right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id) left JOIN sys_user su on (pmp.director_id = su.id) left join sys_depart sd on (su.depart_ids = sd.id) - left join pay_confirm_payment_record pcpr on pmps.id = pcpr.project_id left join v_confirm_payment_record vcpr on pmps.id = vcpr.project_id left join v_payment_record vpr on pmps.id = vpr.project_id left join v_mail_bill_project vmbp on pmps.id = vmbp.project_id - group by pmps.id,pcpr.id + group by pmps.id union all SELECT pms.id, pm.id as superId, @@ -414,17 +411,16 @@ from (SELECT pwgs.id, vmbp.no_tax_amount as invoiceNoTaxAmount, vcpr.no_tax_amount as confirmNoTaxAmount, company_contact_name as contactsName, - DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + vcpr.payment_date as confirmDate, pms.create_time as createTime FROM pay_meeting pm right join pay_meeting_situation pms on (pm.id = pms.meeting_id) left JOIN sys_user su on (pm.director_id = su.id) left join sys_depart sd on (su.depart_ids = sd.id) - left join pay_confirm_payment_record pcpr on pms.id = pcpr.project_id left join v_confirm_payment_record vcpr on pms.id = vcpr.project_id left join v_payment_record vpr on pms.id = vpr.project_id left join v_mail_bill_project vmbp on pms.id = vmbp.project_id - group by pms.id,pcpr.id + group by pms.id union all SELECT tmps.id, tmp.id as superId, @@ -451,17 +447,16 @@ from (SELECT pwgs.id, vmbp.no_tax_amount as invoiceNoTaxAmount, vcpr.no_tax_amount as confirmNoTaxAmount, liaison_man as contactsName, - DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + vcpr.payment_date as confirmDate, tmps.create_time as createTime FROM tb_member_project tmp left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) left JOIN sys_user su on (tmp.director_id = su.id) left join sys_depart sd on (su.depart_ids = sd.id) - left join pay_confirm_payment_record pcpr on tmps.id = pcpr.project_id left join v_confirm_payment_record vcpr on tmps.id = vcpr.project_id left join v_payment_record vpr on tmps.id = vpr.project_id left join v_mail_bill_project vmbp on tmps.id = vmbp.project_id - group by tmps.id,pcpr.id + group by tmps.id union all SELECT tcp.id, tmp.id as superId, @@ -488,17 +483,16 @@ from (SELECT pwgs.id, vmbp.no_tax_amount as invoiceNoTaxAmount, vcpr.no_tax_amount as confirmNoTaxAmount, liaison_man as contactsName, - DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + vcpr.payment_date as confirmDate, tcp.create_time as createTime FROM tb_member_project tmp left join tb_certificate_payment tcp on (tmp.id = tcp.project_id) left JOIN sys_user su on (tmp.director_id = su.id) left join sys_depart sd on (su.depart_ids = sd.id) - left join pay_confirm_payment_record pcpr on tcp.id = pcpr.project_id left join v_confirm_payment_record vcpr on tcp.id = vcpr.project_id left join v_payment_record vpr on tcp.id = vpr.project_id left join v_mail_bill_project vmbp on tcp.id = vmbp.project_id - group by tcp.id,pcpr.id + group by tcp.id ) pp where pp.allMoney is not null and pp.allMoney != 0