From be6c003950c60569d4ee7425c59fa005b8a55b70 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 27 Mar 2024 10:30:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2082961=20=E6=89=93=E5=8C=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E7=82=B9=E5=87=BB=E9=A1=B9=E7=9B=AE--=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=89=93=E5=8C=85--=E9=80=89=E6=8B=A9=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A=E8=AE=AE=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E8=81=94=E7=B3=BB=E4=BA=BA=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年2月变更.sql | 2 +- .../xml/PayPackCompanyProjectMapper.xml | 34 +++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/db/24年2月变更.sql b/db/24年2月变更.sql index 30b767f3..5ad216e0 100644 --- a/db/24年2月变更.sql +++ b/db/24年2月变更.sql @@ -158,7 +158,7 @@ SET ppc.receivable_amount = ppc.pack_charge_total, WHERE ppc.receivable_amount IS NULL AND ppc.pack_year = '2024' - AND ppc.pack_charge_total IS NOT NULL + AND ppc.pack_charge_total IS NOT NULL; -- 增加问题征集的查询和导出按钮 INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1772111035504529410', '1443470646404014081', '问题征集-查询', NULL, NULL, NULL, NULL, 2, 'standardsMeeting:problemCollection:search', '0', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-03-25 11:59:30', 'LKGLZ', '2024-03-25 12:00:10', 0, 0, '1', 0, 1); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml index 4f0be3d3..dcac6bce 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml @@ -35,11 +35,13 @@ ( select c.id,c.charge_project,c.invoice_amount, c.charge_use, c.principal_id,su.realname as principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount, - c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,'' as phone,'' as email,affirm_income + c.paid_amount,c.need_invoice,c.pack,c.in_account,c.make_invoice,c.mail,c.create_time,1 as projectType,pcm.phone,pcm.email,affirm_income ,c.mail_contacts_id,c.mail_contacts_temporary_id,c.mail_contacts_temporary_name from pay_common_project c left join sys_user su on c.principal_id = su.id - + LEFT JOIN pay_contacts_management pcm ON c.contacts_temporary_id = pcm.id + + AND c.charge_company_id = #{companyId} @@ -52,14 +54,15 @@ UNION ALL - select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsubc.contacts_temporary_id as contacts_temporary_id_one,gsubc.contacts_temporary_name as contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount, - gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'','',affirm_income + select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsubc.contacts_temporary_id as contacts_temporary_id,gsubc.contacts_temporary_name as contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount, + gsub.paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,pcm.phone,pcm.email,affirm_income ,gsub.mail_contacts_id,gsub.mail_contacts_temporary_id,gsub.mail_contacts_temporary_name from pay_working_group g left join sys_user su on g.principal_id_a = su.id inner join pay_working_group_subitem gsub on g.id = gsub.working_group_id inner join pay_working_group_subitem_contacts gsubc on gsubc.working_group_sub_id = gsub.id and order_num=1 - + LEFT JOIN pay_contacts_management pcm ON gsubc.contacts_temporary_id = pcm.id + AND gsub.charge_company_id = #{companyId} @@ -72,13 +75,14 @@ UNION ALL - select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, su.realname,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable, - sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.phone,'',affirm_income + select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, su.realname,sit.company_contact_temporary_id AS contacts_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable, + sit.paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,pcm.phone,pcm.email,affirm_income ,sit.post_contact_id as mail_contacts_id,sit.post_contact_temporary_id as mail_contacts_temporary_id,sit.post_contact_name as mail_contacts_temporary_name from pay_meeting meeting left join sys_user su on meeting.director_id = su.id inner join pay_meeting_situation sit on meeting.id = sit.meeting_id - + LEFT JOIN pay_contacts_management pcm ON sit.company_contact_temporary_id = pcm.id + sit.register_check_result != 0 AND sit.company_id = #{companyId} @@ -92,13 +96,14 @@ UNION ALL - select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id, su.realname,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable, - msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'','',affirm_income + select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id, su.realname,msub.company_contact_temporary_id AS contacts_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable, + msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,pcm.phone,pcm.email,affirm_income ,msub.post_contact_id as mail_contacts_id,msub.post_contact_temporary_id as mail_contacts_temporary_id,msub.post_contact_name as mail_contacts_temporary_name from pay_member_project pmp left join sys_user su on pmp.director_id = su.id inner join pay_member_project_subitem msub on pmp.id = msub.project_id - + LEFT JOIN pay_contacts_management pcm ON msub.company_contact_temporary_id = pcm.id + AND msub.company_id = #{companyId} @@ -131,13 +136,14 @@ UNION ALL - select tcp.id,tmember.project_name,tcp.invoice_amount,tcp.charge_use,tmember.director_id, su.realname,'',tcp.liaison_man,tcp.company_name,tcp.amount_receivable, - tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,tcp.mobile,tcp.email,affirm_income + select tcp.id,tmember.project_name,tcp.invoice_amount,tcp.charge_use,tmember.director_id, su.realname,'',pcm.name as contacts_temporary_name,tcp.company_name,tcp.amount_receivable, + tcp.paid_amount,tcp.invoice_requirements,tcp.pack,tcp.in_account,tcp.make_invoice,tcp.mail,tcp.create_time,6,pcm.phone,pcm.email,affirm_income ,null as mail_contacts_id,null as mail_contacts_temporary_id,null as mail_contacts_temporary_name from tb_member_project tmember left join sys_user su on tmember.director_id = su.id inner join tb_certificate_payment tcp on tmember.id = tcp.project_id - + LEFT JOIN pay_contacts_management pcm ON tcp.liaison_man_id = pcm.id + AND tcp.company_id = #{companyId}