diff --git a/db/统计视图.sql b/db/统计视图.sql index b2b10d08..0fc75cf3 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -33,7 +33,7 @@ from (SELECT pwgs.id, 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.no_tax_amount as allMoney, pwgs.paid_amount as comeAllMoney, pwgs.charge_use as chargeUse, sd.depart_name as depart, @@ -67,7 +67,7 @@ from (SELECT pwgs.id, 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.no_tax_amount as allMoney, pcp.paid_amount as comeAllMoney, pcp.charge_use as chargeUse, sd.depart_name as depart, @@ -99,7 +99,7 @@ from (SELECT pwgs.id, pmps.company_id AS chargeCompanyId, pmps.company_id as chargeCompanyTemporaryId, pmps.company_name AS chargeCompanyTemporaryName, - pmps.amount_receivable as allMoney, + pmps.no_tax_amount as allMoney, pmps.paid_amount as comeAllMoney, pmps.charge_use as chargeUse, sd.depart_name as depart, @@ -132,7 +132,7 @@ from (SELECT pwgs.id, pms.company_id AS chargeCompanyId, pms.company_id as chargeCompanyTemporaryId, pms.company_name AS chargeCompanyTemporaryName, - pms.amount_receivable as allMoney, + pms.no_tax_amount as allMoney, pms.paid_amount as comeAllMoney, pms.charge_use as chargeUse, sd.depart_name as depart, @@ -165,7 +165,7 @@ from (SELECT pwgs.id, tmps.company_id AS chargeCompanyId, tmps.company_id as chargeCompanyTemporaryId, tmps.company_name AS chargeCompanyTemporaryName, - tmps.amount_receivable as allMoney, + tmps.no_tax_amount as allMoney, tmps.paid_amount as comeAllMoney, tmps.charge_use as chargeUse, sd.depart_name as depart, @@ -198,7 +198,7 @@ from (SELECT pwgs.id, tcp.company_id AS chargeCompanyId, tcp.company_id as chargeCompanyTemporaryId, tcp.company_name AS chargeCompanyTemporaryName, - tcp.amount_receivable as allMoney, + tcp.no_tax_amount as allMoney, tcp.paid_amount as comeAllMoney, tcp.charge_use as chargeUse, sd.depart_name as depart, @@ -443,7 +443,7 @@ from (SELECT pwgs.id, 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.no_tax_amount as allMoney, pwgs.paid_amount as comeAllMoney, pwgs.charge_use as chargeUse, sd.depart_name as depart, @@ -477,7 +477,7 @@ group by pwgs.id,pcpr.id 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.no_tax_amount as allMoney, pcp.paid_amount as comeAllMoney, pcp.charge_use as chargeUse, sd.depart_name as depart, @@ -509,7 +509,7 @@ group by pcp.id,pcpr.id pmps.company_id AS chargeCompanyId, pmps.company_id as chargeCompanyTemporaryId, pmps.company_name AS chargeCompanyTemporaryName, - pmps.amount_receivable as allMoney, + pmps.no_tax_amount as allMoney, pmps.paid_amount as comeAllMoney, pmps.charge_use as chargeUse, sd.depart_name as depart, @@ -542,7 +542,7 @@ group by pcp.id,pcpr.id pms.company_id AS chargeCompanyId, pms.company_id as chargeCompanyTemporaryId, pms.company_name AS chargeCompanyTemporaryName, - pms.amount_receivable as allMoney, + pms.no_tax_amount as allMoney, pms.paid_amount as comeAllMoney, pms.charge_use as chargeUse, sd.depart_name as depart, @@ -575,7 +575,7 @@ group by pcp.id,pcpr.id tmps.company_id AS chargeCompanyId, tmps.company_id as chargeCompanyTemporaryId, tmps.company_name AS chargeCompanyTemporaryName, - tmps.amount_receivable as allMoney, + tmps.no_tax_amount as allMoney, tmps.paid_amount as comeAllMoney, tmps.charge_use as chargeUse, sd.depart_name as depart, @@ -608,7 +608,7 @@ group by pcp.id,pcpr.id tcp.company_id AS chargeCompanyId, tcp.company_id as chargeCompanyTemporaryId, tcp.company_name AS chargeCompanyTemporaryName, - tcp.amount_receivable as allMoney, + tcp.no_tax_amount as allMoney, tcp.paid_amount as comeAllMoney, tcp.charge_use as chargeUse, sd.depart_name as depart, 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 22e03dcb..54040104 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 @@ -2138,7 +2138,7 @@ select - sum(contract_amount) as allMoney + sum(no_tax_amount) as allMoney from pay_income_contract @@ -2210,12 +2210,12 @@