From 047fae9b3966a614c53278e9192d6c3a3c1a07de Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 7 Jun 2022 18:12:32 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5=E6=AC=BE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=9D=A5?= =?UTF-8?q?=E6=AC=BE=E7=BB=9F=E8=AE=A1=E6=94=B9=E7=94=A8=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayWorkingGroupMapper.xml | 581 +++--------------- 1 file changed, 75 insertions(+), 506 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index d4cee790..7163a5f4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -125,115 +125,91 @@ - - + + @@ -2562,227 +2538,24 @@ chargeCompanyTemporaryId,chargeCompanyTemporaryName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney, createTime from - (SELECT - pwgs.charge_company_id as chargeCompanyTemporaryId, - pcm.company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - pwgs.create_time as createTime - FROM ( - select pwgs2.id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney,charge_company_id,pwgs2.create_time - from (select - pwg1s.id,working_group_id,receivable_amount,paid_amount,charge_company_id,pwg1s.create_time - from pay_working_group_subitem pwg1s - - - - - - ) pwgs2 left join pay_working_group pwg - ON (pwg.id=pwgs2.working_group_id) - - - AND pwg.year LIKE - concat(#{companyComeMoneySearch.year},'%') - - - pwg.principal_id_a in - - #{item} - - - - GROUP BY pwgs2.charge_company_id - ) pwgs - left join pay_company_management pcm on(pcm.id=pwgs.charge_company_id) - - - - AND pwgs.charge_company_id=#{companyComeMoneySearch.chargeCompanyId} - - - union all - SELECT - pcp1.charge_company_id as chargeCompanyTemporaryId, - pcm.company_name as chargeCompanyTemporaryName, - sum(pcp1.receivable_amount) as allMoney, - sum(pcp1.paid_amount) as comeAllMoney, - pcp1.create_time as createTime - FROM - (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.charge_company_id,pcp.year from - pay_common_project pcp - - - - - - ) pcp1 - left join pay_company_management pcm on(pcm.id=pcp1.charge_company_id) + v_statistical v - pcp1.principal_id in + principalNameId in #{item} - AND pcp1.year LIKE + AND year LIKE concat(#{companyComeMoneySearch.year},'%') - AND pcp1.charge_company_id=#{companyComeMoneySearch.chargeCompanyId} - - group by pcp1.charge_company_id - union all - SELECT - company_id as chargeCompanyTemporaryId, - company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - create_time as createTime - FROM ( - select projectId,sum(amount_receivable) AS allMoney,sum(paid_amount) AS comeAllMoney ,pmp1s.create_time,company_id,company_name from( - select pmp2s.id,pmp2s.project_id as projectId,amount_receivable,paid_amount,pmp2s.create_time,company_id,company_name from - pay_member_project_subitem pmp2s - - - - - - ) pmp1s left join pay_member_project pmp on(pmp.id=pmp1s.projectId) - - - pmp.director_id in - - #{item} - - - - AND pmp.particular_year LIKE - concat(#{companyComeMoneySearch.year},'%') - - - group by pmp1s.company_id - ) pmps - - - - AND pmps.company_id=#{companyComeMoneySearch.chargeCompanyId} + AND chargeCompanyTemporaryId = #{companyComeMoneySearch.chargeCompanyId} - union all - SELECT - company_id as chargeCompanyTemporaryId, - company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - createTime - FROM (select SUM(allMoney) AS - allMoney,SUM(comeAllMoney) AS comeAllMoney,pms.create_time as createTime ,company_id,company_name - from (select pm1s.meeting_id,amount_receivable as allMoney ,paid_amount as comeAllMoney,pm1s.create_time,company_id,company_name - from pay_meeting_situation pm1s - - - - - - ) pms left join pay_meeting pm on(pm.id=pms.meeting_id) - - - pm.director_id in - - #{item} - - - - AND pm.particular_year LIKE - concat(#{companyComeMoneySearch.year},'%') - - group by pms.company_id) pmss - - - - AND pmss.company_id=#{companyComeMoneySearch.chargeCompanyId} - - - union all - SELECT - company_id as chargeCompanyTemporaryId, - company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - createTime - FROM (select SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name - from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id - from tb_member_project_subitem tmp1s - - - - - - ) tpms - left join tb_member_project tmp on(tmp.id=tpms.project_id) - - - tmp.director_id in - - #{item} - - - - - AND tmp.year LIKE - concat(#{companyComeMoneySearch.year},'%') - - - group by tpms.company_id) ppp - - - - AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} - - - union all - SELECT - company_id as chargeCompanyTemporaryId, - company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - createTime - FROM (select SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name - from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id - from tb_certificate_payment tmp1s - - - - - - ) tpms - left join tb_member_project tmp on(tmp.id=tpms.project_id) - - - tmp.director_id in - - #{item} - - - - - AND tmp.year LIKE - concat(#{companyComeMoneySearch.year},'%') - - - group by tpms.company_id) ppp - - - - AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} - - - ) pp where pp.allMoney is not null and pp.allMoney !=0 - group by pp.chargeCompanyTemporaryId ) ppp + group by v.chargeCompanyTemporaryId + ) ppp @@ -2807,227 +2580,24 @@ chargeCompanyTemporaryId,chargeCompanyTemporaryName,SUM(allMoney) as allMoney,sum(comeAllMoney) as comeAllMoney, createTime from - (SELECT - pwgs.charge_company_id as chargeCompanyTemporaryId, - pcm.company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - pwgs.create_time as createTime - FROM ( - select pwgs2.id,working_group_id,SUM(receivable_amount) AS allMoney,SUM(paid_amount) AS comeAllMoney,charge_company_id,pwgs2.create_time - from (select - pwg1s.id,working_group_id,receivable_amount,paid_amount,charge_company_id,pwg1s.create_time - from pay_working_group_subitem pwg1s - - - - - - ) pwgs2 left join pay_working_group pwg - ON (pwg.id=pwgs2.working_group_id) - - - AND pwg.year LIKE - concat(#{companyComeMoneySearch.year},'%') - - - pwg.principal_id_a in - - #{item} - - - - GROUP BY pwgs2.charge_company_id - ) pwgs - left join pay_company_management pcm on(pcm.id=pwgs.charge_company_id) - - - - AND pwgs.charge_company_id=#{companyComeMoneySearch.chargeCompanyId} - - - union all - SELECT - pcp1.charge_company_id as chargeCompanyTemporaryId, - pcm.company_name as chargeCompanyTemporaryName, - sum(pcp1.receivable_amount) as allMoney, - sum(pcp1.paid_amount) as comeAllMoney, - pcp1.create_time as createTime - FROM - (select pcp.principal_id,pcp.principal_name,pcp.receivable_amount,pcp.paid_amount,pcp.create_time,pcp.charge_company_id,pcp.year from - pay_common_project pcp - - - - - - ) pcp1 - left join pay_company_management pcm on(pcm.id=pcp1.charge_company_id) + v_statistical v - pcp1.principal_id in + principalNameId in #{item} - AND pcp1.year LIKE + AND year LIKE concat(#{companyComeMoneySearch.year},'%') - AND pcp1.charge_company_id=#{companyComeMoneySearch.chargeCompanyId} - - group by pcp1.charge_company_id - union all - SELECT - company_id as chargeCompanyTemporaryId, - company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - create_time as createTime - FROM ( - select projectId,sum(amount_receivable) AS allMoney,sum(paid_amount) AS comeAllMoney ,pmp1s.create_time,company_id,company_name from( - select pmp2s.id,pmp2s.project_id as projectId,amount_receivable,paid_amount,pmp2s.create_time,company_id,company_name from - pay_member_project_subitem pmp2s - - - - - - ) pmp1s left join pay_member_project pmp on(pmp.id=pmp1s.projectId) - - - pmp.director_id in - - #{item} - - - - AND pmp.particular_year LIKE - concat(#{companyComeMoneySearch.year},'%') + AND chargeCompanyTemporaryId = #{companyComeMoneySearch.chargeCompanyId} - group by pmp1s.company_id - ) pmps - - - - AND pmps.company_id=#{companyComeMoneySearch.chargeCompanyId} - - - union all - SELECT - company_id as chargeCompanyTemporaryId, - company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - createTime - FROM (select SUM(allMoney) AS - allMoney,SUM(comeAllMoney) AS comeAllMoney,pms.create_time as createTime ,company_id,company_name - from (select pm1s.meeting_id,amount_receivable as allMoney ,paid_amount as comeAllMoney,pm1s.create_time,company_id,company_name - from pay_meeting_situation pm1s - - - - - - ) pms left join pay_meeting pm on(pm.id=pms.meeting_id) - - - pm.director_id in - - #{item} - - - - AND pm.particular_year LIKE - concat(#{companyComeMoneySearch.year},'%') - - group by pms.company_id) pmss - - - - AND pmss.company_id=#{companyComeMoneySearch.chargeCompanyId} - - - union all - SELECT - company_id as chargeCompanyTemporaryId, - company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - createTime - FROM (select SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name - from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id - from tb_member_project_subitem tmp1s - - - - - - ) tpms - left join tb_member_project tmp on(tmp.id=tpms.project_id) - - - tmp.director_id in - - #{item} - - - - - AND tmp.year LIKE - concat(#{companyComeMoneySearch.year},'%') - - - group by tpms.company_id) ppp - - - - AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} - - - union all - SELECT - company_id as chargeCompanyTemporaryId, - company_name as chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - createTime - FROM (select SUM(amount_receivable) AS - allMoney,SUM(paid_amount) AS comeAllMoney,tpms.create_time as createTime ,company_id,company_name - from(select amount_receivable,paid_amount,tmp1s.create_time,company_id,company_name,tmp1s.project_id - from tb_certificate_payment tmp1s - - - - - - ) tpms - left join tb_member_project tmp on(tmp.id=tpms.project_id) - - - tmp.director_id in - - #{item} - - - - - AND tmp.year LIKE - concat(#{companyComeMoneySearch.year},'%') - - - group by tpms.company_id) ppp - - - - AND ppp.company_id=#{companyComeMoneySearch.chargeCompanyId} - - - ) pp where pp.allMoney is not null and pp.allMoney !=0 - group by pp.chargeCompanyTemporaryId ) ppp + group by v.chargeCompanyTemporaryId + ) ppp @@ -3044,7 +2614,6 @@ -