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

修改bug#41972

Browse Source
This commit is contained in:
梁琦涛
2021-11-03 15:10:03 +08:00
parent d92c07ec29
commit 957f4b43f3
6 changed files with 120 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+10 -5
View File
@@ -114,11 +114,12 @@
pcp.charge_company_temporary_name AS chargeCompanyName,
pcp.receivable_amount AS receivableAmount,
pcp.paid_amount AS paidAmount,
pcp.principal_name AS principalName,
su.realname AS principalName,
pcp.contacts_temporary_name AS contactsName,
pica.create_time AS createTime
FROM pay_income_contract_associated pica
JOIN pay_common_project pcp ON pica.project_id = pcp.id
left join sys_user su on pcp.principal_id = su.id
WHERE pica.contract_id = #{contractId}
UNION ALL
SELECT
@@ -131,12 +132,13 @@
pwgs.charge_company_temporary_name AS chargeCompanyName,
pwgs.receivable_amount AS receivableAmount,
pwgs.paid_amount AS paidAmount,
pwg.principal_name_a AS principalName,
su.realname AS principalName,
pwgs.contacts_temporary_name_one AS contactsName,
pica.create_time AS createTime
FROM pay_income_contract_associated pica
JOIN pay_working_group_subitem pwgs ON pica.project_id = pwgs.id
LEFT JOIN pay_working_group pwg ON pwgs.working_group_id = pwg.id
left join sys_user su on pwg.principal_id_a = su.id
WHERE pica.contract_id = #{contractId}
UNION ALL
SELECT
@@ -149,12 +151,13 @@
sit.company_name AS chargeCompanyName,
sit.amount_receivable AS receivableAmount,
sit.paid_amount AS paidAmount,
meeting.director_name AS principalName,
su.realname AS principalName,
sit.company_contact_name AS contactsName,
pica.create_time AS createTime
FROM pay_income_contract_associated pica
JOIN pay_meeting_situation sit ON pica.project_id = sit.id
LEFT JOIN pay_meeting meeting ON meeting.id = sit.meeting_id
left join sys_user su on meeting.director_id = su.id
WHERE pica.contract_id = #{contractId}
UNION ALL
SELECT
@@ -167,12 +170,13 @@
msub.company_name AS chargeCompanyName,
msub.amount_receivable AS receivableAmount,
msub.paid_amount AS paidAmount,
pmp.director_name AS principalName,
su.realname AS principalName,
msub.company_contact_name AS contactsName,
pica.create_time AS createTime
FROM pay_income_contract_associated pica
JOIN pay_member_project_subitem msub ON pica.project_id = msub.id
LEFT JOIN pay_member_project pmp ON pmp.id=msub.project_id
left join sys_user su on pmp.director_id = su.id
WHERE pica.contract_id = #{contractId}
UNION ALL
SELECT
@@ -185,12 +189,13 @@
tmsub.company_name AS chargeCompanyName,
tmsub.amount_receivable AS receivableAmount,
tmsub.paid_amount AS paidAmount,
tmember.director_name AS principalName,
su.realname AS principalName,
tmsub.liaison_man AS contactsName,
pica.create_time AS createTime
FROM pay_income_contract_associated pica
JOIN tb_member_project_subitem tmsub ON pica.project_id = tmsub.id
LEFT JOIN tb_member_project tmember ON tmember.id=tmsub.project_id
left join sys_user su on tmember.director_id = su.id
WHERE pica.contract_id = #{contractId}
) a
ORDER BY createTime DESC,projectId DESC