From b1051f16a67a47b70794679c44ad319adbb7d08e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Sep 2022 10:28:20 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=9F=E8=AE=A1=E8=A7=86=E5=9B=BEsq?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/统计视图.sql | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/db/统计视图.sql b/db/统计视图.sql index ed78ab82..717d8ef9 100644 --- a/db/统计视图.sql +++ b/db/统计视图.sql @@ -39,7 +39,7 @@ from (SELECT pwgs.id, pwgs.pack as pack, pwg.year as year, pwgs.in_account as payStatue, - su.org_code as departCode, + sd.org_code as departCode, sd.id as departId, pwg.principal_id_a as principalNameId, 2 as type, @@ -53,7 +53,7 @@ from (SELECT pwgs.id, 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) + left join sys_depart sd on (su.depart_ids = sd.id) left JOIN pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pwgs.id group by pwgs.id union all @@ -71,7 +71,7 @@ from (SELECT pwgs.id, pcp.pack as pack, pcp.year as year, pcp.in_account as payStatue, - su.org_code as departCode, + sd.org_code as departCode, sd.id as departId, pcp.principal_id as principalNameId, 1 as type, @@ -84,7 +84,7 @@ from (SELECT pwgs.id, 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) + left join sys_depart sd on (su.depart_ids = sd.id) union all SELECT pmps.id, pmp.id as superId, @@ -100,7 +100,7 @@ from (SELECT pwgs.id, pmps.pack as pack, pmp.particular_year as year, pmps.in_account as payStatue, - su.org_code as departCode, + sd.org_code as departCode, sd.id as departId, pmp.director_id as principalNameId, 4 as type, @@ -114,7 +114,7 @@ from (SELECT pwgs.id, 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) + left join sys_depart sd on (su.depart_ids = sd.id) union all SELECT pms.id, pm.id as superId, @@ -130,7 +130,7 @@ from (SELECT pwgs.id, pms.pack as pack, pm.particular_year as year, pms.in_account as payStatue, - su.org_code as departCode, + sd.org_code as departCode, sd.id as departId, pm.director_id as principalNameId, 3 as type, @@ -144,7 +144,7 @@ from (SELECT pwgs.id, 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) + left join sys_depart sd on (su.depart_ids = sd.id) union all SELECT tmps.id, tmp.id as superId, @@ -160,7 +160,7 @@ from (SELECT pwgs.id, tmps.pack as pack, tmp.year as year, tmps.in_account as payStatue, - su.org_code as departCode, + sd.org_code as departCode, sd.id as departId, tmp.director_id as principalNameId, 5 as type, @@ -174,7 +174,7 @@ from (SELECT pwgs.id, 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) + left join sys_depart sd on (su.depart_ids = sd.id) union all SELECT tcp.id, tmp.id as superId, @@ -190,7 +190,7 @@ from (SELECT pwgs.id, tcp.pack as pack, tmp.year as year, tcp.in_account as payStatue, - su.org_code as departCode, + sd.org_code as departCode, sd.id as departId, tmp.director_id as principalNameId, 6 as type, @@ -204,7 +204,7 @@ from (SELECT pwgs.id, 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) + left join sys_depart sd on (su.depart_ids = sd.id) ) pp where pp.allMoney is not null and pp.allMoney != 0