add 统计增加排序功能增加完成
回显确认金额
This commit is contained in:
lijiarao
+182
-165
@@ -1,166 +1,177 @@
|
||||
create view v_statistical as
|
||||
select pp.id as projectId,
|
||||
pp.superId,
|
||||
pp.projectName,
|
||||
principalName,
|
||||
chargeCompanyTemporaryId,
|
||||
chargeCompanyTemporaryName,
|
||||
allMoney,
|
||||
comeAllMoney,
|
||||
chargeUse,
|
||||
depart,
|
||||
createTime,
|
||||
if(pp.pack = 0, '否', '是') as packText,
|
||||
year,
|
||||
payStatue,
|
||||
departCode,
|
||||
confirmAmount,
|
||||
principalNameId,
|
||||
type,
|
||||
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_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,
|
||||
su.org_code as departCode,
|
||||
pcpr.amount_received as confirmAmount,
|
||||
pwg.principal_id_a as principalNameId,
|
||||
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.charge_project AS projectName,
|
||||
pcp.principal_name as principalName,
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
pcpr.amount_received as confirmAmount,
|
||||
pcp.principal_id as principalNameId,
|
||||
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.project_name AS projectName,
|
||||
su.realname as principalName,
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
pcpr.amount_received as confirmAmount,
|
||||
pmp.director_id as principalNameId,
|
||||
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.meeting_name AS projectName,
|
||||
su.realname as principalName,
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
0 as confirmAmount,
|
||||
pm.director_id as principalNameId,
|
||||
3 as type,
|
||||
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.org_code = sd.org_code)
|
||||
union all
|
||||
SELECT tmps.id,
|
||||
tmp.id as superId,
|
||||
tmp.project_name AS projectName,
|
||||
su.realname as principalName,
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
0 as confirmAmount,
|
||||
tmp.director_id as principalNameId,
|
||||
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)
|
||||
left JOIN sys_user su on (tmp.director_id = su.id)
|
||||
left join sys_depart sd on (su.org_code = sd.org_code)
|
||||
union all
|
||||
SELECT tcp.id,
|
||||
tmp.id as superId,
|
||||
tmp.project_name AS projectName,
|
||||
su.realname as principalName,
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
0 as confirmAmount,
|
||||
tmp.director_id as principalNameId,
|
||||
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)
|
||||
left JOIN sys_user su on (tmp.director_id = su.id)
|
||||
left join sys_depart sd on (su.org_code = sd.org_code)
|
||||
) pp
|
||||
where pp.allMoney is not null
|
||||
and pp.allMoney != 0
|
||||
order by pp.createTime;
|
||||
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,
|
||||
departCode,
|
||||
principalNameId,
|
||||
type,
|
||||
billMoney,
|
||||
confirmAmount,
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
pwg.principal_id_a as principalNameId,
|
||||
2 as type,
|
||||
pwgs.invoice_amount AS billMoney,
|
||||
confirm_amount as confirmAmount,
|
||||
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.org_code = sd.org_code)
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
pcp.principal_id as principalNameId,
|
||||
1 as type,
|
||||
pcp.invoice_amount AS billMoney,
|
||||
confirm_amount as confirmAmount,
|
||||
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.org_code = sd.org_code)
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
pmp.director_id as principalNameId,
|
||||
4 as type,
|
||||
pmps.invoice_amount AS billMoney,
|
||||
confirm_amount as confirmAmount,
|
||||
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.org_code = sd.org_code)
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
pm.director_id as principalNameId,
|
||||
3 as type,
|
||||
pms.invoice_amount AS billMoney,
|
||||
confirm_amount as confirmAmount,
|
||||
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.org_code = sd.org_code)
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
tmp.director_id as principalNameId,
|
||||
5 as type,
|
||||
tmps.invoice_amount AS billMoney,
|
||||
confirm_amount as confirmAmount,
|
||||
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.org_code = sd.org_code)
|
||||
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,
|
||||
su.org_code as departCode,
|
||||
tmp.director_id as principalNameId,
|
||||
6 as type,
|
||||
tcp.invoice_amount AS billMoney,
|
||||
confirm_amount as confirmAmount,
|
||||
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.org_code = sd.org_code)
|
||||
) pp
|
||||
where pp.allMoney is not null
|
||||
and pp.allMoney != 0
|
||||
order by pp.createTime;
|
||||
|
||||
create table pay_confirm_payment_record
|
||||
(
|
||||
@@ -176,8 +187,14 @@ create table pay_confirm_payment_record
|
||||
remark varchar(200) null comment '备注'
|
||||
) comment '确认来款记录表';
|
||||
alter table pay_common_project
|
||||
add column confirm_amount decimal(12, 2) null comment '确认金额';
|
||||
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
|
||||
alter table pay_working_group_subitem
|
||||
add column confirm_amount decimal(12, 2) null comment '确认金额';
|
||||
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
|
||||
alter table pay_member_project_subitem
|
||||
add column confirm_amount decimal(12, 2) null comment '确认金额';
|
||||
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
|
||||
alter table pay_meeting_situation
|
||||
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
|
||||
alter table tb_member_project_subitem
|
||||
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
|
||||
alter table tb_certificate_payment
|
||||
add column confirm_amount decimal(12, 2) default 0 null comment '确认金额';
|
||||
Reference in New Issue
Block a user