修改bug#41972

2021-11-03 15:10:03 +08:00
parent d92c07ec29
commit 957f4b43f3
6 changed files with 120 additions and 64 deletions
@@ -30,9 +30,10 @@
        from
        (
            <!-- 普通项目-->
-            select c.id,c.charge_project,c.invoice_amount, c.charge_use, c.principal_id,c.principal_name,c.contacts_temporary_id,c.contacts_temporary_name,c.charge_company_temporary_name,c.receivable_amount,
+            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,
            if(c.paid_amount is null or c.paid_amount = '','0.00',c.paid_amount) as 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
            from pay_common_project c
+            left join sys_user su on c.principal_id = su.id
            <where>
                <if test="companyId != null and companyId != ''">
                    AND c.charge_company_id = #{companyId}
@@ -46,9 +47,10 @@
            </where>
            <!--工作组项目-->
            UNION ALL
-            select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,
+            select gsub.id,g.working_group_project,gsub.invoice_amount, gsub.charge_use, g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.contacts_temporary_name_one,gsub.charge_company_temporary_name,gsub.receivable_amount,
        if(gsub.paid_amount is null or gsub.paid_amount = '','0.00',gsub.paid_amount) as paid_amount,gsub.need_invoice,gsub.pack,gsub.in_account,gsub.make_invoice,gsub.mail,gsub.create_time,2,'',''
            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
            <where>
                <if test="companyId != null and companyId != ''">
@@ -63,9 +65,10 @@
            </where>
            <!-- 会议项目-->
            UNION ALL
-            select sit.id,meeting.meeting_name,sit.invoice_amount,sit.charge_use, meeting.director_id, meeting.director_name,sit.company_contact_temporary_id,sit.company_contact_name,sit.company_name,sit.amount_receivable,
+            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,
        if(sit.paid_amount is null or sit.paid_amount = '','0.00',sit.paid_amount) as paid_amount,sit.need_invoice,sit.pack,sit.in_account,sit.make_invoice,sit.mail,sit.create_time,3,sit.phone,''
            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
            <where>
                sit.register_check_result != 0
@@ -81,9 +84,10 @@
            </where>
            <!-- 会员项目-->
            UNION ALL
-            select msub.id,pmp.project_name,msub.invoice_amount,msub.charge_use,pmp.director_id,pmp.director_name,msub.company_contact_temporary_id,msub.company_contact_name,msub.company_name,msub.amount_receivable,
+            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,
        if(msub.paid_amount is null or msub.paid_amount = '','0.00',msub.paid_amount) as paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,'',''
            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
            <where>
                <if test="companyId != null and companyId != ''">
@@ -98,9 +102,10 @@
            </where>
            <!-- 标协会员项目-->
            UNION ALL
-            select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,tmember.director_id,tmember.director_name,'',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,
-        if(tmsub.paid_amount is null or tmsub.paid_amount = '','0.00',tmsub.paid_amount) as paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email
+            select tmsub.id,tmember.project_name,tmsub.invoice_amount,tmsub.charge_use,tmember.director_id, su.realname,'',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,
+        if(tmsub.paid_amount is null or tmsub.paid_amount = '','0.00',tmsub.paid_amount) as paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email
            from tb_member_project tmember
+            left join sys_user su on tmember.director_id = su.id
            inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
            <where>
                <if test="companyId != null and companyId != ''">
@@ -130,8 +135,9 @@
    <select id="queryPackListAll" resultType="com.jero.project.entity.PayCommonProject">
        SELECT * FROM (
        <!-- 普通项目-->
-        select c.id,c.charge_project, c.charge_use, c.principal_id,c.principal_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,c.contacts_temporary_name
+        select c.id,c.charge_project, c.charge_use, c.principal_id,su.realname as principal_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,c.contacts_temporary_name
        from pay_common_project c
+        left join sys_user su on c.principal_id = su.id
        <where>
            <if test="projectId != null and projectId != ''">
                AND c.id = #{projectId}
@@ -151,8 +157,9 @@
        </where>
        <!--工作组项目-->
        UNION ALL
-        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,g.principal_name_a,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,gsub.contacts_temporary_name_one
+        select gsub.id,g.working_group_project, gsub.charge_use, g.principal_id_a,su.realname,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,gsub.contacts_temporary_name_one
        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
        <where>
            <if test="projectId != null and projectId != ''">
@@ -173,8 +180,9 @@
        </where>
        <!-- 会议项目-->
        UNION ALL
-        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, meeting.director_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.company_contact_name
+        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id, su.realname,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.company_contact_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
        <where>
            sit.check_result = 1
@@ -196,8 +204,9 @@
        </where>
        <!-- 会员项目-->
        UNION ALL
-        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,pmp.director_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,msub.company_contact_name
+        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id, su.realname,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,msub.company_contact_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
        <where>
            <if test="projectId != null and projectId != ''">
@@ -218,8 +227,9 @@
        </where>
        <!-- 标协会员项目-->
        UNION ALL
-        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,tmember.director_name,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.liaison_man
+        select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id, su.realname,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.liaison_man
        from tb_member_project tmember
+        left join sys_user su on tmember.director_id = su.id
        inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
        <where>
            <if test="projectId != null and projectId != ''">
@@ -278,9 +288,10 @@
        (
        <!-- 普通项目-->
        select c.id,c.charge_project, c.charge_use,
-        c.principal_id,c.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
+        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
        from pay_common_project c
+        left join sys_user su on c.principal_id = su.id
        <where>
            <if test="companyId != null and companyId != ''">
                AND c.charge_company_id = #{companyId}
@@ -295,8 +306,9 @@
        <!--工作组项目-->
        UNION ALL
        select gsub.id,g.working_group_project, gsub.charge_use,
-        g.principal_id_a,g.principal_name_a,gsub.contacts_temporary_id_one,gsub.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,'',''
+        g.principal_id_a,su.realname,gsub.contacts_temporary_id_one,gsub.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,'',''
        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
        <where>
            <if test="companyId != null and companyId != ''">
@@ -312,8 +324,9 @@
        <!-- 会议项目-->
        UNION ALL
        select sit.id,meeting.meeting_name,sit.charge_use, meeting.director_id,
-        meeting.director_name,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,'',''
+        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,'',''
        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
        <where>
            <if test="companyId != null and companyId != ''">
@@ -329,8 +342,9 @@
        <!-- 会员项目-->
        UNION ALL
        select
-        msub.id,pmp.project_name,msub.charge_use,pmp.director_id,pmp.director_name,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,'',''
+        msub.id,pmp.project_name,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,'',''
        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
        <where>
            <if test="companyId != null and companyId != ''">
@@ -346,8 +360,9 @@
        <!-- 标协会员项目-->
        UNION ALL
        select
-        tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,tmember.director_name,'',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,mobile,email
+        tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,'',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email
        from tb_member_project tmember
+        left join sys_user su on tmember.director_id = su.id
        inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
        <where>
            <if test="companyId != null and companyId != ''">