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

update 统计数据中合同金额改为未税金额

Browse Source
This commit is contained in:
lijiarao
2022-11-10 17:01:10 +08:00
parent 0fa0719315
commit 60eeba1dfe
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/统计视图.sql
+12 -12
View File
@@ -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,
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+11 -11
View File
@@ -2138,7 +2138,7 @@
<!--全所收入统计 合同金额-->
<select id="queryListAllMoney" resultType="com.jero.statistics.entity.AllProjectStatistics">
select
sum(contract_amount) as allMoney,
sum(no_tax_amount) as allMoney,
DATE_FORMAT(contract_date,'%Y-%m') as paymentDate
from pay_income_contract
<where>
@@ -2198,7 +2198,7 @@
<select id="queryAllMoney33" resultType="com.jero.statistics.entity.AllMoney">
select
sum(contract_amount) as allMoney
sum(no_tax_amount) as allMoney
from pay_income_contract
<where>
<if test="allProjectStatisticsSearch.paymentYear != null and allProjectStatisticsSearch.paymentYear != ''">
@@ -2210,12 +2210,12 @@
<select id="cumulativeListAllMoney" resultType="com.jero.statistics.entity.AllProjectStatistics">
SELECT TMP1.paymentDate,
sum(TMP2.allMoney) as allMoney
FROM (SELECT sum(contract_amount) AS allMoney,
FROM (SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(contract_date, '%Y-%m') AS paymentDate
FROM pay_income_contract
WHERE DATE_FORMAT(contract_date, '%Y') LIKE concat('2022', '%')
GROUP BY DATE_FORMAT(contract_date, '%Y-%m')) TMP1,
(SELECT sum(contract_amount) AS allMoney,
(SELECT sum(no_tax_amount) AS allMoney,
DATE_FORMAT(contract_date, '%Y-%m') AS paymentDate
FROM pay_income_contract
WHERE DATE_FORMAT(contract_date, '%Y') LIKE concat('2022', '%')
@@ -2345,7 +2345,7 @@
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,
16 as chargeUse,
sd.depart_name as depart,
@@ -2380,7 +2380,7 @@
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,
@@ -2415,7 +2415,7 @@
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,
@@ -2447,7 +2447,7 @@
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,
@@ -2480,7 +2480,7 @@
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,
@@ -2513,7 +2513,7 @@
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,
@@ -2546,7 +2546,7 @@
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,