feat: 财务管理到账开票列表增加打包管理数据

db/24年2月变更.sql

@@ -63,3 +63,8 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com
 -- 管理端标协会员下增加会员统计和标准统计菜单
 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 ('1765915681293688833', '1438394322899558402', '标准统计', '/incomePayments/memberManage/stardsStandardStatistics', 'incomePayments/memberManage/StardsStandardStatistics', NULL, NULL, 1, NULL, '1', 8.40, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-03-08 09:41:22', NULL, NULL, 0, 0, '1', 0, 1);
 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 ('1765583520246108161', '1438394322899558402', '会员统计', '/incomePayments/memberManage/stardsMemberStatistics', 'incomePayments/memberManage/StardsMemberStatistics', NULL, NULL, 1, NULL, '1', 8.30, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-03-07 11:41:29', NULL, NULL, 0, 0, '1', 0, 1);
+
+-- 字典项目类型新增打包项目
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1767089980854767618', '1435541165297995778', '打包项目', '8', '', 8, 1, 'chh', '2024-03-11 15:27:37' )
+-- 字典来款用途新增打包
+INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1767090351832567809', '1431145150766923778', '打包', '22', '', 22, 1, 'chh', '2024-03-11 15:29:05' )

jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml

@@ -121,6 +121,18 @@
                 AND gsub.id = #{projectId}
             </if>
         </where>
+        <!-- 打包项目-->
+        UNION ALL
+        select ppc.id,ppc.company_temporary_name AS charge_project, 22 AS charge_use, ppc.pack_principal_id as principal_id,su.realname as principal_name,ppc.pack_contact_temporary_id as contacts_temporary_id,
+               ppc.pack_contact_temporary_name,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount,ppc.need_invoice,null as pack,ppc.in_account,ppc.make_invoice,null as mail,ppc.create_time,8 as projectType,'' as phone,'' as email,'' as remarks,ppc.contract_num,ppc.company_temporary_id as charge_company_temporary_id,ppc.charge_way,null as files,ppc.charge_notice_no,ppc.charge_notice_id,null as year, null as mail_contacts_temporary_name,'' as mission_and_objectives
+        ,ppc.tax_rate,ppc.tax,ppc.no_tax_amount,ppc.income_affirm AS affirm_income
+        from pay_pack_company ppc
+        left join sys_user su on ppc.pack_principal_id = su.id
+        <where>
+            <if test="projectId != null and projectId != ''">
+                AND ppc.id = #{projectId}
+            </if>
+        </where>
     </select>
     <select id="queryProjectList" resultType="com.jero.project.entity.PayCommonProject">
         <!-- 普通项目-->

jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml

@@ -273,6 +273,35 @@
         <if test="payCommonProject.affirmIncome != null">
             AND tcp.affirm_income = #{payCommonProject.affirmIncome}
         </if>
+        <!-- 打包项目-->
+        UNION ALL
+        select ppc.id,ppc.company_temporary_name AS charge_project,22 AS charge_use,ppc.pack_principal_id as principal_id,su.realname AS principal_name,ppc.company_id as charge_company_id,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount,
+        ppc.need_invoice,NULL AS pack,ppc.in_account,ppc.make_invoice,NULL AS mail,ppc.create_time,8 AS projectType,ppc.invoice_amount,ppc.mail_contacts_id,'' AS register_check_result,ppc.pack_contact_temporary_name as contacts_temporary_name,NULL AS payment_status,ppc.company_temporary_id,ppc.confirm_amount,ppc.income_affirm AS affirm_income,0 AS admin_add_flag
+        from pay_pack_company ppc
+        left join sys_user su on ppc.pack_principal_id = su.id
+        left join pay_company_management on ppc.company_id = pay_company_management.id
+        where
+        ppc.receivable_amount <![CDATA[<>]]> 0
+        and ppc.receivable_amount is not null
+        <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
+            AND ppc.pack_principal_id = #{payCommonProject.principalId}
+        </if>
+        <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
+            AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))
+        </if>
+        <!-- 来款未开票 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
+            AND (ppc.paid_amount <![CDATA[>]]> ppc.invoice_amount or
+            (ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null))
+        </if>
+        <!-- 开票未来款 -->
+        <if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
+            AND (ppc.paid_amount <![CDATA[<]]> ppc.invoice_amount or
+            (ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0))
+        </if>
+        <if test="payCommonProject.affirmIncome != null">
+            AND ppc.income_affirm = #{payCommonProject.affirmIncome}
+        </if>
         )p
         LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
         <where>