diff --git a/approval/doc_expense_approval_depart.asp b/approval/doc_expense_approval_depart.asp index 5ca83c2..54faf02 100644 --- a/approval/doc_expense_approval_depart.asp +++ b/approval/doc_expense_approval_depart.asp @@ -166,20 +166,22 @@ - + - - - - - - - + + + + + + + + + <% Dim depart_cd_string Dim total_est, total_use, total_res - Dim hang1_res_cost, hang2_res_cost, hang3_res_cost, hang4_res_cost, hang5_res_cost, hang6_res_cost + Dim hang1_res_cost, hang2_res_cost, hang3_res_cost, hang4_res_cost, hang5_res_cost, hang6_res_cost, hang7_res_cost, hang8_res_cost, hang9_res_cost depart_cd_string = "" total_est = 0 total_use = 0 @@ -200,33 +202,52 @@ Query = Query & " ,ISNULL(SUM(hang4_cost),0) as hang4_cost " Query = Query & " ,ISNULL(SUM(hang5_cost),0) as hang5_cost " Query = Query & " ,ISNULL(SUM(hang6_cost),0) as hang6_cost " + Query = Query & " ,ISNULL(SUM(hang7_cost),0) as hang7_cost " + Query = Query & " ,ISNULL(SUM(hang8_cost),0) as hang8_cost " + Query = Query & " ,ISNULL(SUM(hang9_cost),0) as hang9_cost " Query = Query & " ,ISNULL(SUM(hang1_use_cost),0) as hang1_use_cost " Query = Query & " ,ISNULL(SUM(hang2_use_cost),0) as hang2_use_cost " Query = Query & " ,ISNULL(SUM(hang3_use_cost),0) as hang3_use_cost " Query = Query & " ,ISNULL(SUM(hang4_use_cost),0) as hang4_use_cost " Query = Query & " ,ISNULL(SUM(hang5_use_cost),0) as hang5_use_cost " Query = Query & " ,ISNULL(SUM(hang6_use_cost),0) as hang6_use_cost " + Query = Query & " ,ISNULL(SUM(hang7_use_cost),0) as hang7_use_cost " + Query = Query & " ,ISNULL(SUM(hang8_use_cost),0) as hang8_use_cost " + Query = Query & " ,ISNULL(SUM(hang9_use_cost),0) as hang9_use_cost " Query = Query & " from( " END IF - Query = Query & " SELECT GCE.depart_nm, GCE.depart_cd, hang1_cost, hang2_cost, hang3_cost, hang4_cost, hang5_cost, hang6_cost, " + Query = Query & " SELECT GCE.depart_nm, GCE.depart_cd, hang1_cost, hang2_cost, hang3_cost, hang4_cost, hang5_cost, hang6_cost, hang7_cost, hang8_cost, hang9_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '식대' THEN VGC.cost ELSE 0 END), 0) AS hang1_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '교통비' THEN VGC.cost ELSE 0 END), 0) AS hang2_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '회식비' THEN VGC.cost ELSE 0 END), 0) AS hang3_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '물품구입비' THEN VGC.cost ELSE 0 END), 0) AS hang4_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '주차비' THEN VGC.cost ELSE 0 END), 0) AS hang5_use_cost, " - Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '기타' THEN VGC.cost ELSE 0 END), 0) AS hang6_use_cost " + Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '기타' THEN VGC.cost ELSE 0 END), 0) AS hang6_use_cost, " + Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '식대 및 교통비' THEN VGC.cost ELSE 0 END), 0) AS hang7_use_cost, " + 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 " - Query = Query & " ON CHARINDEX(VGC.d_code, GCE.depart_cd) > 0 AND VGC.cost_date BETWEEN GCE.st_date AND GCE.ed_date " + Query = Query & " ON VGC.d_code IN ( " + Query = Query & " CASE WHEN GCE.depart_cd = 'S801' THEN 'S301' ELSE GCE.depart_cd END, " + Query = Query & " CASE WHEN GCE.depart_cd = 'S801' THEN 'S401' ELSE GCE.depart_cd END, " + Query = Query & " CASE WHEN GCE.depart_cd = 'S801' THEN 'S501' ELSE GCE.depart_cd END, " + Query = Query & " CASE WHEN GCE.depart_cd = 'S801' THEN 'S601' ELSE GCE.depart_cd END " + Query = Query & " ) " + 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 Query = Query & " AND GCE.partner_no = '" & Session("User_Number") & "' " Else - Query = Query & " AND CHARINDEX('" & Session("N_depart") & Session("N_team") & "', GCE.depart_cd) > 0 " - End If + 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 + Query = Query & " AND GCE.depart_cd = 'S801' " + Else + Query = Query & " AND GCE.depart_cd = '" & Session("N_depart") & Session("N_team") & "' " + END IF + End If 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 " + 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 Query = Query & " ) GROUP_COST " @@ -239,8 +260,8 @@ depart_cd_string = adoRs("depart_cd_string") END IF - total_est = adoRs("hang1_cost") + adoRs("hang2_cost") + adoRs("hang3_cost") + adoRs("hang4_cost") + adoRs("hang5_cost") + adoRs("hang6_cost") - total_use = adoRs("hang1_use_cost") + adoRs("hang2_use_cost") + adoRs("hang3_use_cost") + adoRs("hang4_use_cost") + adoRs("hang5_use_cost") + adoRs("hang6_use_cost") + total_est = adoRs("hang1_cost") + adoRs("hang2_cost") + adoRs("hang3_cost") + adoRs("hang4_cost") + adoRs("hang5_cost") + adoRs("hang6_cost") + adoRs("hang7_cost") + adoRs("hang8_cost") + total_use = adoRs("hang1_use_cost") + adoRs("hang2_use_cost") + adoRs("hang3_use_cost") + adoRs("hang4_use_cost") + adoRs("hang5_use_cost") + adoRs("hang6_use_cost") + adoRs("hang7_use_cost") + adoRs("hang8_use_cost") total_res = total_est - total_use hang1_res_cost = adoRs("hang1_cost") - adoRs("hang1_use_cost") @@ -249,6 +270,9 @@ hang4_res_cost = adoRs("hang4_cost") - adoRs("hang4_use_cost") hang5_res_cost = adoRs("hang5_cost") - adoRs("hang5_use_cost") hang6_res_cost = adoRs("hang6_cost") - adoRs("hang6_use_cost") + hang7_res_cost = adoRs("hang7_cost") - adoRs("hang7_use_cost") + hang8_res_cost = adoRs("hang8_cost") - adoRs("hang8_use_cost") + hang9_res_cost = adoRs("hang9_cost") - adoRs("hang9_use_cost") %> @@ -264,32 +288,20 @@ <% end if %> - - - - - - + + - - - - - - + + - - - - - - + + <% @@ -303,30 +315,34 @@ - - - - - - + + + + + + + <% Dim total_est2, total_use2, total_res2 - Dim hang1_res_cost2, hang2_res_cost2, hang3_res_cost2, hang4_res_cost2, hang5_res_cost2, hang6_res_cost2 + Dim hang1_res_cost2, hang2_res_cost2, hang3_res_cost2, hang4_res_cost2, hang5_res_cost2, hang6_res_cost2, hang7_res_cost2, hang8_res_cost2 total_est2 = 0 total_use2 = 0 total_res2 = 0 over_hang = "" Query = "" - Query = Query & " SELECT GCE.depart_nm, hang1_cost, hang2_cost, hang3_cost, hang4_cost, hang5_cost, hang6_cost, " + Query = Query & " SELECT GCE.depart_nm, hang1_cost, hang2_cost, hang3_cost, hang4_cost, hang5_cost, hang6_cost, hang7_cost, hang8_cost, hang9_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '식대' THEN VGC.cost ELSE 0 END), 0) AS hang1_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '교통비' THEN VGC.cost ELSE 0 END), 0) AS hang2_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '회식비' THEN VGC.cost ELSE 0 END), 0) AS hang3_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '물품구입비' THEN VGC.cost ELSE 0 END), 0) AS hang4_use_cost, " Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '주차비' THEN VGC.cost ELSE 0 END), 0) AS hang5_use_cost, " - Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '기타' THEN VGC.cost ELSE 0 END), 0) AS hang6_use_cost " + Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '기타' THEN VGC.cost ELSE 0 END), 0) AS hang6_use_cost, " + Query = Query & " ISNULL(SUM(CASE WHEN VGC.txt_hangmok = '식대 및 교통비' THEN VGC.cost ELSE 0 END), 0) AS hang7_use_cost, " + 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 Query = Query & " ON VGC.d_code = 'E101' AND VGC.cost_date BETWEEN GCE.st_date AND GCE.ed_date " @@ -340,22 +356,28 @@ Query = Query & " WHERE use_yn = '1' " Query = Query & " AND GCE.depart_cd='" & Session("User_Number") & "'" Query = Query & " AND '" & now_month & "-01' BETWEEN GCE.st_date AND GCE.ed_date " - Query = Query & " GROUP BY GCE.depart_nm, hang1_cost, hang2_cost, hang3_cost, hang4_cost, hang5_cost, hang6_cost " + Query = Query & " GROUP BY GCE.depart_nm, hang1_cost, hang2_cost, hang3_cost, hang4_cost, hang5_cost, hang6_cost, hang7_cost, hang8_cost, hang9_cost " 'Response.Write Query adoRs.open Query, adoconn,adopenstatic, adlockreadonly if adoRs.recordCount > 0 Then - total_est2 = adoRs("hang1_cost") + adoRs("hang2_cost") + adoRs("hang3_cost") + adoRs("hang4_cost") + adoRs("hang5_cost") + adoRs("hang6_cost") - total_use2 = adoRs("hang1_use_cost") + adoRs("hang2_use_cost") + adoRs("hang3_use_cost") + adoRs("hang4_use_cost") + adoRs("hang5_use_cost") + adoRs("hang6_use_cost") + 'total_est2 = adoRs("hang1_cost") + adoRs("hang2_cost") + adoRs("hang3_cost") + adoRs("hang4_cost") + adoRs("hang5_cost") + adoRs("hang6_cost") + adoRs("hang7_cost") + adoRs("hang8_cost") + 'total_use2 = adoRs("hang1_use_cost") + adoRs("hang2_use_cost") + adoRs("hang3_use_cost") + adoRs("hang4_use_cost") + adoRs("hang5_use_cost") + adoRs("hang6_use_cost") + adoRs("hang7_use_cost") + adoRs("hang8_use_cost") + total_est2 = adoRs("hang9_cost") + total_use2 = adoRs("hang9_use_cost") total_res2 = total_est2 - total_use2 - hang1_res_cost2 = adoRs("hang1_cost") - adoRs("hang1_use_cost") - hang2_res_cost2 = adoRs("hang2_cost") - adoRs("hang2_use_cost") - hang3_res_cost2 = adoRs("hang3_cost") - adoRs("hang3_use_cost") - hang4_res_cost2 = adoRs("hang4_cost") - adoRs("hang4_use_cost") - hang5_res_cost2 = adoRs("hang5_cost") - adoRs("hang5_use_cost") - hang6_res_cost2 = adoRs("hang6_cost") - adoRs("hang6_use_cost") + 'hang1_res_cost2 = adoRs("hang1_cost") - adoRs("hang1_use_cost") + 'hang2_res_cost2 = adoRs("hang2_cost") - adoRs("hang2_use_cost") + 'hang3_res_cost2 = adoRs("hang3_cost") - adoRs("hang3_use_cost") + 'hang4_res_cost2 = adoRs("hang4_cost") - adoRs("hang4_use_cost") + 'hang5_res_cost2 = adoRs("hang5_cost") - adoRs("hang5_use_cost") + 'hang6_res_cost2 = adoRs("hang6_cost") - adoRs("hang6_use_cost") + 'hang7_res_cost2 = adoRs("hang7_cost") - adoRs("hang7_use_cost") + 'hang8_res_cost2 = adoRs("hang8_cost") - adoRs("hang8_use_cost") + hang9_res_cost2 = adoRs("hang9_cost") - adoRs("hang9_use_cost") + hang9_res_cost = adoRs("hang9_cost") - adoRs("hang9_use_cost") %> - - - - - - + - - - - - - + <% @@ -402,7 +414,7 @@ - + @@ -428,12 +440,19 @@ @@ -653,9 +672,20 @@ alert("기타 항목에 대한 예산을 초과하여 사용하실 수 없습니다.\n"); return false; } + if(<%= hang7_res_cost %> - +(tmp_use_sum["식대 및 교통비"] || 0) < 0){ + alert("식대 및 교통비 항목에 대한 예산을 초과하여 사용하실 수 없습니다.\n"); + return false; + } + if(<%= hang8_res_cost %> - +(tmp_use_sum["회식비 및 기타"] || 0) < 0){ + alert("회식비 및 기타 항목에 대한 예산을 초과하여 사용하실 수 없습니다.\n"); + return false; + } + if(<%= hang9_res_cost %> - +(tmp_use_sum["활동비"] || 0) < 0){ + alert("활동비 항목에 대한 예산을 초과하여 사용하실 수 없습니다.\n"); + return false; + } <% End If %> - if (tmp_cost_sum * 1 == 0) { alert("비용을 입력하세요."); diff --git a/approval/doc_expense_approval_depart_print.asp b/approval/doc_expense_approval_depart_print.asp index a622808..a5861f9 100644 --- a/approval/doc_expense_approval_depart_print.asp +++ b/approval/doc_expense_approval_depart_print.asp @@ -57,7 +57,8 @@ ''///=============== ''로그인 사용자 정보 user_name(0) = Session("User_Number") - Query = "SELECT p_name, p_team_name, p_rank_name, p_tel3 FROM project2.dbo.V_Person WHERE p_no = '" & user_name(0) & "'" + 'Query = "SELECT p_name, p_team_name, p_rank_name, p_tel3 FROM project2.dbo.V_Person WHERE p_no = '" & user_name(0) & "'" + Query = "SELECT p_name, CASE WHEN p_team_name IN ( '솔루션개발그룹','데이터분석그룹','온라인서베이운영그룹', '디지털COMM그룹') THEN '디지털서비스본부' ELSE p_team_name END AS p_team_name, p_rank_name, p_tel3 FROM project2.dbo.V_Person WHERE p_no = '" & user_name(0) & "'" adoRs.open Query, adoconn,adopenstatic, adlockreadonly user_name(1) = adoRs("p_name") '이름 user_name(2) = adoRs("p_rank_name") '직위 코드 diff --git a/approval/inc_payapproval_line.asp b/approval/inc_payapproval_line.asp index b274eaf..3b9e7a0 100644 --- a/approval/inc_payapproval_line.asp +++ b/approval/inc_payapproval_line.asp @@ -64,7 +64,8 @@ ' tmp_ess(tmp_dcode(d_code, 1), tmp_dcode(d_code, 2)) = "20220901" '이서윤 ' End If - if Session("User_Number") = "20191202" Then 'OR Session("User_Number") = "20250201" OR Session("User_Number") = "20220901" Then ' 김현정, 육아휴직으로 대체 박미선, 이서윤 + 'if Session("User_Number") = "20191202" Then 'OR Session("User_Number") = "20250201" OR Session("User_Number") = "20220901" Then ' 김현정, 육아휴직으로 대체 박미선, 이서윤 + if Session("User_Number") = "20191202" Then 'OR Session("User_Number") = "20250201" Then ' 김현정, 육아휴직으로 대체 박미선, 이서윤 tmp_ess(tmp_dcode(d_code, 1), tmp_dcode(d_code, 2)) = "전결" if tmp_type <> "0" Then tmp_type = "3" diff --git a/business/busi_approval.asp b/business/busi_approval.asp index dd9671f..307649c 100644 --- a/business/busi_approval.asp +++ b/business/busi_approval.asp @@ -27,7 +27,8 @@ ''로그인 사용자 정보 user_name(0) = Session("User_Number") - query = "SELECT p_name, p_team_name, p_rank_name, p_tel3 FROM project2.dbo.V_Person WHERE p_no = '" & user_name(0) & "'" + 'query = "SELECT p_name, p_team_name, p_rank_name, p_tel3 FROM project2.dbo.V_Person WHERE p_no = '" & user_name(0) & "'" + Query = "SELECT p_name, CASE WHEN p_team_name IN ( '솔루션개발그룹','데이터분석그룹','온라인서베이운영그룹', '디지털COMM그룹') THEN '디지털서비스본부' ELSE p_team_name END AS p_team_name, p_rank_name, p_tel3 FROM project2.dbo.V_Person WHERE p_no = '" & user_name(0) & "'" adoRs.open query, adoconn,adopenstatic, adlockreadonly user_name(1) = adoRs("p_name") '이름 user_name(2) = adoRs("p_rank_name") '직위 코드 diff --git a/business/busi_list.asp b/business/busi_list.asp index d8b4b27..0f895b7 100644 --- a/business/busi_list.asp +++ b/business/busi_list.asp @@ -201,7 +201,7 @@ perQuery = perQuery & " OR (p_depart_now = 'R' AND p_team_now in ('701','702','703') AND p_position_now = 3 ) OR p_no in ('20230906','20230705','20250103','20250901') "'마케팅2그룹장 공석(이혜진상무 직무대행) -> 윤인주,서보화,오수연 추가 End If if session("User_Number") = "20031102" Then '채주희 - DCO 본부장 - perQuery = perQuery & " OR (p_depart_now = 'S' AND p_team_now IN ('301','401','501','601') AND p_position_now = 3) " + perQuery = perQuery & " OR (p_depart_now = 'S' AND p_team_now IN ('301','401','501','601','801') AND p_position_now = 3) " ' perQuery = perQuery & " OR (p_depart_now = 'S' AND p_team_now in ('401')) " '솔루션 개발 그룹장 대리 250122 jelee End if if session("User_Number") = "20210405" Then '최정심 - DIN 본부장 -> 김희정 그룹장으로 변경 @@ -227,7 +227,7 @@ response.write "------ Depart_Code : "& Session("Depart_Code") &"-------
" response.write "------ N_depart : "& Session("N_depart") &"-------
" response.write "------ N_team : "& Session("N_team") &"-------
" - response.write perQuery + 'response.write perQuery end if Rs.Open perQuery, adoConn, 1 @@ -247,7 +247,7 @@ groupQuery = groupQuery & " FROM V_GROUP_COST_NEW VGC LEFT JOIN T_PROJECT_METHOD TPM ON VGC.txt_pjt = TPM.p_child_sn " groupQuery = groupQuery & " WHERE VGC.p_no IN (" & p_no_arr & ") " groupQuery = groupQuery & " AND VGC.cost_date LIKE '" & ym & "%' " - 'response.write groupQuery + response.write groupQuery jobQuery = "" jobQuery = jobQuery & " SELECT JL.p_no " @@ -267,7 +267,7 @@ jobQuery = jobQuery & " LEFT JOIN Job_Code JC ON JL.j_contents = JC.j_code " jobQuery = jobQuery & " LEFT JOIN cost_category CC ON CA.cost_code = CC.cost_code " jobQuery = jobQuery & " WHERE p_no IN (" & p_no_arr & ") AND JL.j_date LIKE '" & ym & "%' " - 'response.write "
"& jobquery + response.write "
"& jobquery loginQuery = "" loginQuery = loginQuery & " SELECT p_no, ymd, login_time, logout_time, gap_time " diff --git a/business/job_cost_total_group.asp b/business/job_cost_total_group.asp index 30997cf..011544e 100644 --- a/business/job_cost_total_group.asp +++ b/business/job_cost_total_group.asp @@ -75,7 +75,8 @@
<%=now_month %><%=now_month %> 구분식대교통비회식비물품구입비주차비기타합계식대 및 교통비회식비 및 기타합계
예산" readonly />" readonly />" readonly />" readonly />" readonly />" readonly />" readonly />" readonly />
사용" readonly />" readonly />" readonly />" readonly />" readonly />" readonly />" readonly />" readonly />
잔여
<%=now_month %> 구분식대교통비회식비물품구입비주차비기타활동비 합계
@@ -372,22 +394,12 @@
사용" readonly />" readonly />" readonly />" readonly />" readonly />" readonly />" readonly />
잔여
증빙일자 프로젝트 항목세부항목세부항목 금액
<% query = "" - query = query & " SELECT depart , sum(cost) as cost, count(1) as cnt " + 'query = query & " SELECT depart , sum(cost) as cost, count(1) as cnt " + query = query & " SELECT CASE WHEN depart IN ('개발그룹','온라인서베이운영그룹','데이터분석그룹','디지털COMM그룹') THEN '디지털서비스본부' ELSE depart END AS depart, SUM(cost) AS cost, COUNT(1) AS cnt " query = query & " FROM V_GROUP_COST_NEW with(nolock) " query = query & " where 1 = 1 " query = query & " AND left(cost_date,7) = '" & job_month & "' " if( search_depart <> "" )then - query = query & " and depart = '" & search_depart & "' " + 'query = query & " and depart = '" & search_depart & "' " + If search_depart = "디지털서비스본부" Then + query = query & " AND depart IN ('개발그룹','온라인서베이운영그룹','데이터분석그룹','디지털COMM그룹') " + Else + query = query & " AND depart = '" & search_depart & "' " + End If end if if session("depart_code") <> "18" and session("teamplace") <> "6" Then query = query & " and ((depart_cd = '" & Session("depart_code") & "' " query = query & " and depart_cd <> '0') OR " query = query & " depart = '" & Session("loginuser") & "') " End If - query = query & " group by depart " + 'query = query & " group by depart " + query = query & " GROUP BY CASE WHEN depart IN ('개발그룹','온라인서베이운영그룹','데이터분석그룹','디지털COMM그룹') THEN '디지털서비스본부' ELSE depart END " query = query & " order by depart asc " Adors.open query, adoconn, adopenstatic, adlockreadonly diff --git a/business/job_cost_total_group_dtl.asp b/business/job_cost_total_group_dtl.asp index 9710ae6..d23ccbc 100644 --- a/business/job_cost_total_group_dtl.asp +++ b/business/job_cost_total_group_dtl.asp @@ -73,7 +73,8 @@ - - + + <% For i=1 to Adors.recordcount
항목 세부항목 금액부서작성자부서작성자