LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 打包管理项目在列表中出现时 列表中的打包为对勾显示

Browse Source
This commit is contained in:
mzaxd
2024-03-12 11:11:14 +08:00
parent 5480a2d281
commit a59f4c23d1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml
+1 -1
View File
@@ -124,7 +124,7 @@
<!-- 打包项目-->
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.pack_contact_temporary_name,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount,ppc.need_invoice,1 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
jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+2 -2
View File
@@ -276,7 +276,7 @@
<!-- 打包项目-->
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
ppc.need_invoice,1 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
@@ -553,7 +553,7 @@
<!-- 打包项目-->
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
ppc.need_invoice,1 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
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