add 统计增加排序功能
This commit is contained in:
lijiarao
+43
-13
@@ -14,11 +14,12 @@ select pp.id as projectId,
|
||||
year,
|
||||
payStatue,
|
||||
departCode,
|
||||
confirmAmount,
|
||||
principalNameId,
|
||||
type,
|
||||
pp.pack
|
||||
from (SELECT pwgs.id,
|
||||
pwg.id as superId,
|
||||
pwg.id as superId,
|
||||
pwg.working_group_project AS projectName,
|
||||
pwg.principal_name_a as principalName,
|
||||
pwgs.charge_company_temporary_id as chargeCompanyTemporaryId,
|
||||
@@ -31,16 +32,18 @@ from (SELECT pwgs.id,
|
||||
pwg.year as year,
|
||||
pwgs.in_account as payStatue,
|
||||
su.org_code as departCode,
|
||||
pcpr.amount_received as confirmAmount,
|
||||
pwg.principal_id_a as principalNameId,
|
||||
2 as type,
|
||||
2 as type,
|
||||
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 pay_confirm_payment_record pcpr on (pwgs.id = pcpr.project_id)
|
||||
left JOIN sys_user su on (pwg.principal_id_a = su.id)
|
||||
left join sys_depart sd on (su.org_code = sd.org_code)
|
||||
union all
|
||||
SELECT pcp.id,
|
||||
pcp.id as superId,
|
||||
pcp.id as superId,
|
||||
pcp.charge_project AS projectName,
|
||||
pcp.principal_name as principalName,
|
||||
pcp.charge_company_temporary_id as chargeCompanyTemporaryId,
|
||||
@@ -53,15 +56,17 @@ from (SELECT pwgs.id,
|
||||
pcp.year as year,
|
||||
pcp.in_account as payStatue,
|
||||
su.org_code as departCode,
|
||||
pcpr.amount_received as confirmAmount,
|
||||
pcp.principal_id as principalNameId,
|
||||
1 as type,
|
||||
1 as type,
|
||||
pcp.create_time as createTime
|
||||
FROM pay_common_project pcp
|
||||
left JOIN pay_confirm_payment_record pcpr on (pcp.id = pcpr.project_id)
|
||||
left JOIN sys_user su on (pcp.principal_id = su.id)
|
||||
left join sys_depart sd on (su.org_code = sd.org_code)
|
||||
union all
|
||||
SELECT pmps.id,
|
||||
pmp.id as superId,
|
||||
pmp.id as superId,
|
||||
pmp.project_name AS projectName,
|
||||
su.realname as principalName,
|
||||
pmps.company_id as chargeCompanyTemporaryId,
|
||||
@@ -74,16 +79,18 @@ from (SELECT pwgs.id,
|
||||
pmp.particular_year as year,
|
||||
pmps.in_account as payStatue,
|
||||
su.org_code as departCode,
|
||||
pcpr.amount_received as confirmAmount,
|
||||
pmp.director_id as principalNameId,
|
||||
4 as type,
|
||||
4 as type,
|
||||
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 pay_confirm_payment_record pcpr on (pmp.id = pcpr.project_id)
|
||||
left JOIN sys_user su on (pmp.director_id = su.id)
|
||||
left join sys_depart sd on (su.org_code = sd.org_code)
|
||||
union all
|
||||
SELECT pms.id,
|
||||
pm.id as superId,
|
||||
pm.id as superId,
|
||||
pm.meeting_name AS projectName,
|
||||
su.realname as principalName,
|
||||
pms.company_id as chargeCompanyTemporaryId,
|
||||
@@ -96,8 +103,9 @@ from (SELECT pwgs.id,
|
||||
pm.particular_year as year,
|
||||
pms.in_account as payStatue,
|
||||
su.org_code as departCode,
|
||||
0 as confirmAmount,
|
||||
pm.director_id as principalNameId,
|
||||
3 as type,
|
||||
3 as type,
|
||||
pms.create_time as createTime
|
||||
FROM pay_meeting pm
|
||||
right join pay_meeting_situation pms on (pm.id = pms.meeting_id)
|
||||
@@ -105,7 +113,7 @@ from (SELECT pwgs.id,
|
||||
left join sys_depart sd on (su.org_code = sd.org_code)
|
||||
union all
|
||||
SELECT tmps.id,
|
||||
tmp.id as superId,
|
||||
tmp.id as superId,
|
||||
tmp.project_name AS projectName,
|
||||
su.realname as principalName,
|
||||
tmps.company_id as chargeCompanyTemporaryId,
|
||||
@@ -118,8 +126,9 @@ from (SELECT pwgs.id,
|
||||
tmp.year as year,
|
||||
tmps.in_account as payStatue,
|
||||
su.org_code as departCode,
|
||||
0 as confirmAmount,
|
||||
tmp.director_id as principalNameId,
|
||||
5 as type,
|
||||
5 as type,
|
||||
tmps.create_time as createTime
|
||||
FROM tb_member_project tmp
|
||||
left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
|
||||
@@ -127,7 +136,7 @@ from (SELECT pwgs.id,
|
||||
left join sys_depart sd on (su.org_code = sd.org_code)
|
||||
union all
|
||||
SELECT tcp.id,
|
||||
tmp.id as superId,
|
||||
tmp.id as superId,
|
||||
tmp.project_name AS projectName,
|
||||
su.realname as principalName,
|
||||
tcp.company_id as chargeCompanyTemporaryId,
|
||||
@@ -140,8 +149,9 @@ from (SELECT pwgs.id,
|
||||
tmp.year as year,
|
||||
tcp.in_account as payStatue,
|
||||
su.org_code as departCode,
|
||||
0 as confirmAmount,
|
||||
tmp.director_id as principalNameId,
|
||||
6 as type,
|
||||
6 as type,
|
||||
tcp.create_time as createTime
|
||||
FROM tb_member_project tmp
|
||||
left join tb_certificate_payment tcp on (tmp.id = tcp.project_id)
|
||||
@@ -150,4 +160,24 @@ from (SELECT pwgs.id,
|
||||
) pp
|
||||
where pp.allMoney is not null
|
||||
and pp.allMoney != 0
|
||||
order by pp.createTime;
|
||||
order by pp.createTime;
|
||||
|
||||
create table pay_confirm_payment_record
|
||||
(
|
||||
id varchar(36) not null comment 'id'
|
||||
primary key,
|
||||
create_by varchar(50) null comment '创建人',
|
||||
create_time datetime null comment '创建日期',
|
||||
update_by varchar(50) null comment '更新人',
|
||||
update_time datetime null comment '更新日期',
|
||||
project_id varchar(50) null comment '项目id',
|
||||
amount_received decimal(12, 2) null comment '到账金额',
|
||||
payment_date date null comment '到账日期',
|
||||
remark varchar(200) null comment '备注'
|
||||
) comment '确认来款记录表';
|
||||
alter table pay_common_project
|
||||
add column confirm_amount decimal(12, 2) null comment '确认金额';
|
||||
alter table pay_working_group_subitem
|
||||
add column confirm_amount decimal(12, 2) null comment '确认金额';
|
||||
alter table pay_member_project_subitem
|
||||
add column confirm_amount decimal(12, 2) null comment '确认金额';
|
||||
|
||||
Reference in New Issue
Block a user