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

fix 87714 首页--全院经营数据统计--单月、累计--预估收入金额--没有统计年度会员维护项目

Browse Source
This commit is contained in:
lijiarao
2024-07-30 10:07:19 +08:00
parent c86eb4d4f6
commit 2e45b960c6
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/统计视图（新）.sql
+4 -4
View File
@@ -203,7 +203,7 @@ from (SELECT pwgs.id,
vcpr.no_tax_amount as confirmNoTaxAmount,
liaison_man as contactsName,
vcpr.payment_date as confirmDate,
null as estimatedArrivalDate,
estimated_arrival_date as estimatedArrivalDate,
tmps.create_time as createTime
FROM tb_member_project tmp
left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
@@ -460,7 +460,7 @@ from (SELECT pwgs.id,
vcpr.no_tax_amount as confirmNoTaxAmount,
liaison_man as contactsName,
vcpr.payment_date as confirmDate,
null as estimatedArrivalDate,
estimated_arrival_date as estimatedArrivalDate,
tmps.create_time as createTime
FROM tb_member_project tmp
left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
@@ -1074,7 +1074,7 @@ from (SELECT pwgs.id,
vcpr.no_tax_amount as confirmNoTaxAmount,
liaison_man as contactsName,
vcpr.payment_date as confirmDate,
null as estimatedArrivalDate,
estimated_arrival_date as estimatedArrivalDate,
tmps.create_time as createTime
FROM tb_member_project tmp
left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
@@ -1374,7 +1374,7 @@ from (SELECT pwgs.id,
vcpr.no_tax_amount as confirmNoTaxAmount,
liaison_man as contactsName,
vcpr.payment_date as confirmDate,
null as estimatedArrivalDate,
estimated_arrival_date as estimatedArrivalDate,
tmps.create_time as createTime
FROM tb_member_project tmp
left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+5 -21
View File
@@ -2674,27 +2674,11 @@
<!-- 统计预计到账金额（应收金额） 预计到账日期 -->
<select id="cumulativeListEstimatedArrivalMoney"
resultType="com.jero.statistics.entity.AllProjectStatistics">
select DATE_FORMAT(paymentDate, '%Y-%m') as paymentDate,sum(estimatedArrivalMoney) as estimatedArrivalMoney from (
select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate
from pay_common_project
where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
and pack = 0
union all
select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate
from pay_working_group_subitem
where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
and pack = 0
union all
select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate
from pay_meeting_situation
where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
and pack = 0
union all
select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate
from pay_member_project_subitem
where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
and pack = 0
) dataAll group by DATE_FORMAT(paymentDate, '%Y-%m') order by paymentDate
select DATE_FORMAT(estimatedArrivalDate, '%Y-%m') as paymentDate,
sum(allMoney) as estimatedArrivalMoney
from v_statistical_pack
where DATE_FORMAT(estimatedArrivalDate, '%Y') = #{paymentYear}
group by DATE_FORMAT(estimatedArrivalDate, '%Y-%m') order by paymentDate
</select>
<select id="queryPageListForCompanyClassification"