From 6f7e71dcb08666cdad7f1f2bc8dfc5edd826c4f5 Mon Sep 17 00:00:00 2001 From: Choins Date: Tue, 3 Mar 2026 17:17:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B5=9C=EB=82=A8=EC=8B=9D=20::=2020260303=20:?= =?UTF-8?q?:=20=EC=B5=9C=ED=99=98,=EA=B9=80=ED=98=84=EC=A0=95,=EA=B9=80?= =?UTF-8?q?=ED=9D=AC=EC=A0=95=20=EB=B3=B8=EB=B6=80=EC=9E=A5=20=ED=99=9C?= =?UTF-8?q?=EB=8F=99=EB=B9=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- approval/doc_expense_approval_depart.asp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/approval/doc_expense_approval_depart.asp b/approval/doc_expense_approval_depart.asp index 6a723db..1648812 100644 --- a/approval/doc_expense_approval_depart.asp +++ b/approval/doc_expense_approval_depart.asp @@ -193,7 +193,7 @@ ' 최정심 상무님 [ Session("User_Number") = "20151203" ]은 파트너가 아니지만 억지로 파트너로 만듬 V_GROUP_COST_NEW 뷰 테이블에 하드코딩 되어 있음 ' 채주희 본부장님 [ Session("User_Number") = "20031102" ]은 파트너가 아니지만 억지로 파트너로 만듬 V_GROUP_COST_NEW 뷰 테이블에 하드코딩 되어 있음 Query = "" - If Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then + If Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then Query = Query & " Select 'GROUP_SUM' as depart_nm " Query = Query & " ,''''+STRING_AGG(depart_cd,''',''')+'''' as depart_cd_string " Query = Query & " ,ISNULL(SUM(hang1_cost),0) as hang1_cost " @@ -236,7 +236,7 @@ Query = Query & " AND VGC.cost_date BETWEEN GCE.st_date AND GCE.ed_date " Query = Query & " WHERE use_yn = '1' " '박준성 2023-05-02 파트너들 한도 추가 - If Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then + If Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then Query = Query & " AND GCE.partner_no = '" & Session("User_Number") & "' " Else If Session("N_depart") = "S" And (Session("N_team") = "301" Or Session("N_team") = "401" Or Session("N_team") = "501" Or Session("N_team") = "601") Then @@ -251,14 +251,14 @@ Query = Query & " AND '" & now_month & "-01' BETWEEN GCE.st_date AND GCE.ed_date " Query = Query & " GROUP BY GCE.depart_nm, GCE.depart_cd, hang1_cost, hang2_cost, hang3_cost, hang4_cost, hang5_cost, hang6_cost, hang7_cost, hang8_cost, hang9_cost " '2023-05-15 서성완 파트너는 관리하는 팀 그룹비 & 사용내역 제공 (단 그룹비는 2개 팀 이상일 경우 합산해서 제공) - If Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then + If Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then Query = Query & " ) GROUP_COST " END IF 'Response.Write Query adoRs.open Query, adoconn,adopenstatic, adlockreadonly if adoRs.recordCount > 0 Then - If Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then + If Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then depart_cd_string = adoRs("depart_cd_string") END IF @@ -282,7 +282,7 @@ <% - if Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR session("Depart_Code") <> "0" OR Session("N_Depart") = "E" then + if Session("User_Number") = "20150302" OR Session("User_Number") = "20210405" OR Session("User_Number") = "20191202" OR Session("User_Number") = "20031102" OR session("Depart_Code") <> "0" OR Session("N_Depart") = "E" then %>
@@ -312,7 +312,8 @@ %> - <%If Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then %> + + <%If Session("User_Number") = "20150302" OR Session("User_Number") = "20210405" OR Session("User_Number") = "20191202" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then %> @@ -346,7 +347,7 @@ Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '회식비 및 기타' THEN VGC.cost ELSE 0 END), 0) AS hang8_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '활동비' THEN VGC.cost ELSE 0 END), 0) AS hang9_use_cost " Query = Query & " FROM GROUP_COST_EST GCE LEFT JOIN V_GROUP_COST_NEW VGC " - IF Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" THEN + IF Session("User_Number") = "20150302" OR Session("User_Number") = "20210405" OR Session("User_Number") = "20191202" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" THEN Query = Query & " ON VGC.d_code = 'E101' AND VGC.cost_date BETWEEN GCE.st_date AND GCE.ed_date " END IF 'IF Session("User_Number") = "20000201" OR Session("User_Number") = "20160205" THEN '박준성 2023-05-02 원성훈 부사장님은 특별취급 E102로 고정 @@ -386,7 +387,7 @@ 본부장
활동비 <% - if Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR session("Depart_Code") <> "0" then + if Session("User_Number") = "20150302" OR Session("User_Number") = "20210405" OR Session("User_Number") = "20191202" OR Session("User_Number") = "20031102" OR session("Depart_Code") <> "0" then %>
@@ -449,7 +450,7 @@ - <%If Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then %> + <%If Session("User_Number") = "20150302" OR Session("User_Number") = "20210405" OR Session("User_Number") = "20191202" OR Session("User_Number") = "20031102" OR Session("N_Depart") = "E" Then %> <% else %> @@ -527,7 +528,7 @@ Elseif depart_cd_string <> "" then ' 2023-05-15 박준성 파트너들이 각 그룹의 사용내역 볼 수 있게 변경 자기의 사용내역은 못 봄 preGroupfeeQuery = preGroupfeeQuery & " and d_code in (" & depart_cd_string & ") " - Elseif Session("User_Number") = "20151203" OR Session("User_Number") = "20031102" OR session("Depart_Code") = "0" then + Elseif Session("User_Number") = "20150302" OR Session("User_Number") = "20210405" OR Session("User_Number") = "20191202" OR Session("User_Number") = "20031102" OR session("Depart_Code") = "0" then preGroupfeeQuery = preGroupfeeQuery & " and p_no = '" & session("User_Number") & "' " 'Elseif session("Depart_Code") = "17" Or session("Depart_Code") = "19" Then ' preGroupfeeQuery = preGroupfeeQuery & " and (depart_cd = '17' OR (depart_cd = '18' and p_job_part = '08') OR depart_cd = '19') "
<%=now_month %>