diff --git a/db/24年2月变更.sql b/db/24年2月变更.sql index ffb98e04..1a09c816 100644 --- a/db/24年2月变更.sql +++ b/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' ) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index 730b3719..7c95e585 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -121,6 +121,18 @@ AND gsub.id = #{projectId} + + 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 + + + AND ppc.id = #{projectId} + +