diff --git a/db/统计视图.sql b/db/统计视图.sql index 89834e97..a8041ec8 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -408,5 +408,232 @@ set confirm_no_tax_amount = confirm_amount , invoice_no_tax_amount = invoice_amount where invoice_requirements = 0; -select * -from v_statistical; \ No newline at end of file +create view v_statistical_confirm as +select pp.id as projectId, + pp.superId, + pp.projectName, + principalName, + chargeCompanyId, + chargeCompanyTemporaryId, + chargeCompanyTemporaryName, + allMoney, + comeAllMoney, + chargeUse, + depart, + createTime, + if(pp.pack = 0, '否', '是') as packText, + year, + payStatue, + departId, + departCode, + principalNameId, + type, + if(billMoney is null, 0, billMoney) as billMoney, + confirmAmount, + invoiceNoTaxAmount, + paidNoTaxAmount, + confirmNoTaxAmount, + contactsName, + confirmDate, + pp.pack +from (SELECT pwgs.id, + pwg.id as superId, + pwg.working_group_project AS projectName, + pwg.principal_name_a as principalName, + pwgs.charge_company_id AS chargeCompanyId, + pwgs.charge_company_temporary_id as chargeCompanyTemporaryId, + pwgs.charge_company_temporary_name AS chargeCompanyTemporaryName, + pwgs.receivable_amount as allMoney, + pwgs.paid_amount as comeAllMoney, + pwgs.charge_use as chargeUse, + sd.depart_name as depart, + pwgs.pack as pack, + pwg.year as year, + pwgs.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pwg.principal_id_a as principalNameId, + 2 as type, + pwgs.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + pcpr.no_tax_amount as confirmNoTaxAmount, + (select GROUP_CONCAT(DISTINCT pwgsc.contacts_temporary_name order by pwgsc.contacts_temporary_name) from pay_working_group_subitem_contacts pwgsc where pwgsc.working_group_sub_id = pwgs.id) as contactsName, + DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + pwgs.create_time as createTime + FROM pay_working_group pwg + right join pay_working_group_subitem pwgs on (pwg.id = pwgs.working_group_id) + left JOIN sys_user su on (pwg.principal_id_a = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left JOIN pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pwgs.id + left join pay_confirm_payment_record pcpr on pwgs.id = pcpr.project_id +group by pwgs.id,pcpr.id + union all + SELECT pcp.id, + pcp.id as superId, + pcp.charge_project AS projectName, + pcp.principal_name as principalName, + pcp.charge_company_id AS chargeCompanyId, + pcp.charge_company_temporary_id as chargeCompanyTemporaryId, + pcp.charge_company_temporary_name AS chargeCompanyTemporaryName, + pcp.receivable_amount as allMoney, + pcp.paid_amount as comeAllMoney, + pcp.charge_use as chargeUse, + sd.depart_name as depart, + pcp.pack as pack, + pcp.year as year, + pcp.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pcp.principal_id as principalNameId, + 1 as type, + pcp.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + pcpr.no_tax_amount as confirmNoTaxAmount, + contacts_temporary_name as contactsName, + DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + pcp.create_time as createTime + FROM pay_common_project pcp + left JOIN sys_user su on (pcp.principal_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on pcp.id = pcpr.project_id +group by pcp.id,pcpr.id + union all + SELECT pmps.id, + pmp.id as superId, + pmp.project_name AS projectName, + su.realname as principalName, + pmps.company_id AS chargeCompanyId, + pmps.company_id as chargeCompanyTemporaryId, + pmps.company_name AS chargeCompanyTemporaryName, + pmps.amount_receivable as allMoney, + pmps.paid_amount as comeAllMoney, + pmps.charge_use as chargeUse, + sd.depart_name as depart, + pmps.pack as pack, + pmp.particular_year as year, + pmps.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pmp.director_id as principalNameId, + 4 as type, + pmps.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + pcpr.no_tax_amount as confirmNoTaxAmount, + company_contact_name as contactsName, + DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + pmps.create_time as createTime + FROM pay_member_project pmp + right join pay_member_project_subitem pmps on (pmp.id = pmps.project_id) + left JOIN sys_user su on (pmp.director_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on pmps.id = pcpr.project_id + group by pmps.id,pcpr.id + union all + SELECT pms.id, + pm.id as superId, + pm.meeting_name AS projectName, + su.realname as principalName, + pms.company_id AS chargeCompanyId, + pms.company_id as chargeCompanyTemporaryId, + pms.company_name AS chargeCompanyTemporaryName, + pms.amount_receivable as allMoney, + pms.paid_amount as comeAllMoney, + pms.charge_use as chargeUse, + sd.depart_name as depart, + pms.pack as pack, + pm.particular_year as year, + pms.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pm.director_id as principalNameId, + 3 as type, + pms.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + pcpr.no_tax_amount as confirmNoTaxAmount, + company_contact_name as contactsName, + DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + pms.create_time as createTime + FROM pay_meeting pm + right join pay_meeting_situation pms on (pm.id = pms.meeting_id) + left JOIN sys_user su on (pm.director_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on pms.id = pcpr.project_id + group by pms.id,pcpr.id + union all + SELECT tmps.id, + tmp.id as superId, + tmp.project_name AS projectName, + su.realname as principalName, + tmps.company_id AS chargeCompanyId, + tmps.company_id as chargeCompanyTemporaryId, + tmps.company_name AS chargeCompanyTemporaryName, + tmps.amount_receivable as allMoney, + tmps.paid_amount as comeAllMoney, + tmps.charge_use as chargeUse, + sd.depart_name as depart, + tmps.pack as pack, + tmp.year as year, + tmps.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + tmp.director_id as principalNameId, + 5 as type, + tmps.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + pcpr.no_tax_amount as confirmNoTaxAmount, + liaison_man as contactsName, + DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + tmps.create_time as createTime + FROM tb_member_project tmp + left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id) + left JOIN sys_user su on (tmp.director_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on tmps.id = pcpr.project_id + group by tmps.id,pcpr.id + union all + SELECT tcp.id, + tmp.id as superId, + tmp.project_name AS projectName, + su.realname as principalName, + tcp.company_id AS chargeCompanyId, + tcp.company_id as chargeCompanyTemporaryId, + tcp.company_name AS chargeCompanyTemporaryName, + tcp.amount_receivable as allMoney, + tcp.paid_amount as comeAllMoney, + tcp.charge_use as chargeUse, + sd.depart_name as depart, + tcp.pack as pack, + tmp.year as year, + tcp.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + tmp.director_id as principalNameId, + 6 as type, + tcp.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + pcpr.no_tax_amount as confirmNoTaxAmount, + liaison_man as contactsName, + DATE_FORMAT(pcpr.payment_date,'%Y-%m') as confirmDate, + tcp.create_time as createTime + FROM tb_member_project tmp + left join tb_certificate_payment tcp on (tmp.id = tcp.project_id) + left JOIN sys_user su on (tmp.director_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on tcp.id = pcpr.project_id + group by tcp.id,pcpr.id + ) pp +where pp.allMoney is not null + and pp.allMoney != 0 +order by pp.createTime; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index b1ecf788..c8d7860a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -116,9 +116,6 @@ public interface PayWorkingGroupMapper extends BaseMapper { */ IPage queryPageList3(Page page, @Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); - List queryPageListExcel(@Param(value = "allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList, @Param("ids") List ids); - - /** * 个人来款统计 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java index 0ad1fb74..489bf87d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java @@ -55,8 +55,6 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper queryCompanyPageListByCompanyManager(Page page,@Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem,@Param("listNeedInvoice") List listNeedInvoice,@Param("companyId") String companyId); - List importExcelStatistics2(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch,@Param("id") String id,@Param("selections") ArrayList selections); - AllMoney queryPageList233(@Param("payWorkingGroupSubletSearch") PayWorkingGroupSubletSearch payWorkingGroupSubletSearch, @Param("id") String id); } 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 54ad061f..22e03dcb 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 @@ -133,11 +133,39 @@ FROM pay_working_group WHERE id NOT IN (SELECT working_group_id FROM pay_working_group_subitem WHERE charge_company_id=#{companyId}) - + + projectId, + superId, + projectName, + principalName, + chargeCompanyId, + chargeCompanyTemporaryId, + chargeCompanyTemporaryName, + allMoney, + comeAllMoney, + chargeUse, + depart, + createTime, + packText, + year, + payStatue, + departId, + departCode, + principalNameId, + type, + billMoney, + confirmAmount, + invoiceNoTaxAmount, + paidNoTaxAmount, + sum(confirmNoTaxAmount) as confirmNoTaxAmount, + contactsName, + confirmDate, + pack + - - @@ -1427,18 +1175,32 @@ sum(confirmAmount) as confirmAmount from ( select projectId as id, - projectName, - principalNameId as principalId, allMoney, paidNoTaxAmount as comeAllMoney, - packText, - pack, - chargeUse, - chargeCompanyTemporaryName, invoiceNoTaxAmount as billMoney, confirmNoTaxAmount as confirmAmount - from v_statistical v - + from + + v_statistical v + + + (select + + from v_statistical_confirm v + + + + and confirmDate like + concat('%',#{principalPeopleDetailSearch.paymentYear},'-',#{principalPeopleDetailSearch.paymentMonth},'%') + + + and confirmDate like concat('%',#{principalPeopleDetailSearch.paymentYear},'%') + + + + group by projectId + ) v + principalNameId = #{principalPeopleDetailSearch.principalNameId} @@ -1767,8 +1529,28 @@ sum(invoiceNoTaxAmount) as billMoney, sum(confirmNoTaxAmount) as confirmAmount, sum(confirmAmount) as confirmAmount1 - from v_statistical v - + from + + v_statistical v + + + (select + + from v_statistical_confirm v + + + + and confirmDate like + concat('%',#{companyComeMoneySearch.paymentYear},'-',#{companyComeMoneySearch.paymentMonth},'%') + + + and confirmDate like concat('%',#{companyComeMoneySearch.paymentYear},'%') + + + + group by projectId + ) v + principalNameId in @@ -1783,14 +1565,14 @@ AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId} - + group by chargeCompanyId ) ppp @@ -1852,8 +1634,28 @@ createTime, sum(invoiceNoTaxAmount) as billMoney, sum(confirmNoTaxAmount) as confirmAmount - from v_statistical v - + from + + v_statistical v + + + (select + + from v_statistical_confirm v + + + + and confirmDate like + concat('%',#{companyComeMoneySearch.paymentYear},'-',#{companyComeMoneySearch.paymentMonth},'%') + + + and confirmDate like concat('%',#{companyComeMoneySearch.paymentYear},'%') + + + + group by projectId + ) v + principalNameId in @@ -1868,14 +1670,14 @@ AND chargeCompanyId = #{companyComeMoneySearch.chargeCompanyId} - + group by chargeCompanyId ) ppp @@ -2016,8 +1818,28 @@ paidNoTaxAmount as comeAllMoney, invoiceNoTaxAmount as billMoney, confirmNoTaxAmount as confirmAmount - from v_statistical v - + from + + v_statistical v + + + (select + + from v_statistical_confirm v + + + + and confirmDate like + concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'-',#{CompanyComeMoneyDetailSearch.paymentMonth},'%') + + + and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'%') + + + + group by projectId + ) v + chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId} @@ -2057,14 +1879,14 @@ - + ) p @@ -2109,8 +1931,28 @@ pack, invoiceNoTaxAmount as billMoney, confirmNoTaxAmount as confirmAmount - from v_statistical v - + from + + v_statistical v + + + (select + + from v_statistical_confirm v + + + + and confirmDate like + concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'-',#{CompanyComeMoneyDetailSearch.paymentMonth},'%') + + + and confirmDate like concat('%',#{CompanyComeMoneyDetailSearch.paymentYear},'%') + + + + group by projectId + ) v + chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId} @@ -2151,14 +1993,14 @@ - + ) pp @@ -2180,8 +2022,28 @@ sum(invoiceNoTaxAmount) as billMoney, sum(confirmNoTaxAmount) as confirmAmount, sum(confirmAmount) as confirmAmount1 - from v_statistical v - + from + + v_statistical v + + + (select + + from v_statistical_confirm v + + + + and confirmDate like + concat('%',#{departStatisticsSearch.paymentYear},'-',#{departStatisticsSearch.paymentMonth},'%') + + + and confirmDate like concat('%',#{departStatisticsSearch.paymentYear},'%') + + + + group by projectId + ) v + #{item} @@ -2190,14 +2052,14 @@ AND year LIKE concat(#{departStatisticsSearch.year}, '%') - + group by v.departId) p @@ -2233,8 +2095,28 @@ sum(paidNoTaxAmount) as comeAllMoney, sum(invoiceNoTaxAmount) as billMoney, sum(confirmNoTaxAmount) as confirmAmount - from v_statistical v - + from + + v_statistical v + + + (select + + from v_statistical_confirm v + + + + and confirmDate like + concat('%',#{departStatisticsSearch.paymentYear},'-',#{departStatisticsSearch.paymentMonth},'%') + + + and confirmDate like concat('%',#{departStatisticsSearch.paymentYear},'%') + + + + group by projectId + ) v + #{item} @@ -2243,14 +2125,14 @@ AND year LIKE concat(#{departStatisticsSearch.year}, '%') - + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index f3111d5f..d7803d89 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -65,24 +65,71 @@ GROUP BY pwgs.id ORDER BY pwgs.create_time desc + + projectId, + superId, + projectName, + principalName, + chargeCompanyId, + chargeCompanyTemporaryId, + chargeCompanyTemporaryName, + allMoney, + comeAllMoney, + chargeUse, + depart, + createTime, + packText, + year, + payStatue, + departId, + departCode, + principalNameId, + type, + billMoney, + confirmAmount, + invoiceNoTaxAmount, + paidNoTaxAmount, + sum(confirmNoTaxAmount) as confirmNoTaxAmount, + contactsName, + confirmDate, + pack + @@ -134,21 +181,33 @@ sum(billMoney) as billMoney, sum(confirmAmount) as confirmAmount from ( SELECT - principalNameId as principalId, - principalName, - chargeCompanyTemporaryName, - allMoney, - comeAllMoney, - chargeUse, - packText, - pack, projectId as id, - if(pmb.invoice_amount is null, 0.00, pmb.invoice_amount) as billMoney, - confirmAmount - FROM v_statistical v - left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id - left join pay_mail_bill pmb on pmbp.bill_id = pmb.id - left join pay_confirm_payment_record pcpr on(pmbp.project_id=pcpr.project_id) + allMoney, + sum(paidNoTaxAmount) as comeAllMoney, + sum(invoiceNoTaxAmount) as billMoney, + sum(confirmNoTaxAmount) as confirmAmount + FROM + + v_statistical v + + + (select + + from v_statistical_confirm v + + + + and confirmDate like + concat('%',#{payWorkingGroupSubletSearch.paymentYear},'-',#{payWorkingGroupSubletSearch.paymentMonth},'%') + + + and confirmDate like concat('%',#{payWorkingGroupSubletSearch.paymentYear},'%') + + + + group by projectId + ) v + superId = #{id} @@ -185,71 +244,16 @@ - + group by id) p - -