diff --git a/approval/doc_myun_pay.asp b/approval/doc_myun_pay.asp index d6b1a4c..118fdee 100644 --- a/approval/doc_myun_pay.asp +++ b/approval/doc_myun_pay.asp @@ -191,8 +191,19 @@ Query = Query & " where ((work_dt between '" & sel_month & "-01' and '" & sel_month & "-25' AND A.in_time + A.out_time + A.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & sel_month & "-16' and cast(DATEADD(m,1,cast('" & sel_month & "-05' as date)) as varchar) " elseif sel_month > "2022-04" Then - Query = Query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & sel_month & "-26' as date))as varchar) and '" & sel_month & "-25' AND A.in_time + A.out_time + A.p_sebu_code <> '000000004') OR " - Query = Query & " (work_dt between '" & sel_month & "-06' and cast(DATEADD(m,1,cast('" & sel_month & "-05' as date)) as varchar) " + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If Right(sel_month, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + Query = Query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & sel_month & "-26' as date)) as varchar(10)) and '" & sel_month & "-28' AND A.in_time + A.out_time + A.p_sebu_code <> '000000004') " + ElseIf CInt(Right(sel_month, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + Query = Query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & sel_month & "-26' as date)) as varchar(10)) and '" & sel_month & "-25' AND A.in_time + A.out_time + A.p_sebu_code <> '000000004') " + Else + '3월부터: 해당달 1일 ~ 말일 + Query = Query & " where ((work_dt between '" & sel_month & "-01' and convert(varchar(10),EOMONTH(cast('" & sel_month & "-01' as date)),23) AND A.in_time + A.out_time + A.p_sebu_code <> '000000004') " + End If + 'Query = Query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & sel_month & "-26' as date))as varchar) and '" & sel_month & "-25' AND A.in_time + A.out_time + A.p_sebu_code <> '000000004') " + Query = Query & " OR (work_dt between '" & sel_month & "-06' and cast(DATEADD(m,1,cast('" & sel_month & "-05' as date)) as varchar) " else Query = Query & " where ((LEFT(work_dt, 7) = '" & sel_month & "' AND A.in_time + A.out_time + A.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & sel_month & "-16' and cast(DATEADD(m,1,cast('" & sel_month & "-15' as date)) as varchar) " @@ -373,7 +384,17 @@ if sel_month = "2022-04" Then query = query & " where date between '"&sel_month&"-01' and '"&sel_month&"-25' " elseif sel_month > "2022-04" Then - query = query & " where date between cast(DATEADD(m,-1,cast('"&sel_month&"-26' as date))as varchar) and '"&sel_month&"-25' " + If Right(sel_month, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + query = query & " where date between cast(DATEADD(m,-1,cast('" & sel_month & "-26' as date)) as varchar) and '" & sel_month & "-28' " + ElseIf CInt(Right(sel_month, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + query = query & " where date between cast(DATEADD(m,-1,cast('"&sel_month&"-26' as date))as varchar) and '"&sel_month&"-25' " + Else + '3월부터: 해당달 1일 ~ 말일 + query = query & " where date between '" & sel_month & "-01' and EOMONTH('" & sel_month & "-01') " + End If + 'query = query & " where date between cast(DATEADD(m,-1,cast('"&sel_month&"-26' as date))as varchar) and '"&sel_month&"-25' " else query = query & " where date like '" & sel_month & "%' " end if diff --git a/approval/doc_myun_pay_detail.asp b/approval/doc_myun_pay_detail.asp index bcec3ef..a657345 100644 --- a/approval/doc_myun_pay_detail.asp +++ b/approval/doc_myun_pay_detail.asp @@ -222,7 +222,17 @@ if work_month = "2022-04" Then Response.Write work_month & "-01 ~ " & work_month & "-25" elseif work_month > "2022-04" Then - Response.Write DATEADD("m",-1,cdate(work_month & "-26")) & " ~ " & work_month & "-25" + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If CDate(work_month & "-01") >= CDate("2026-03-01") Then + '2026년 3월부터 1일 ~ 말일 + Response.Write CDate(work_month & "-01") & " ~ " & DateAdd("d",-1,DateAdd("m",1,CDate(work_month & "-01"))) + ElseIf CDate(work_month & "-01") = CDate("2026-02-01") Then + '2026년 2월만: 전달 26일 ~ 이번달 말일 + Response.Write DateAdd("m",-1, CDate(work_month & "-26")) & " ~ " & DateAdd("d",-1,DateAdd("m",1,CDate(work_month & "-01"))) + Else + '2026년 3월이전은 전달 26일 ~ 이번달 25일 + Response.Write DATEADD("m",-1,cdate(work_month & "-26")) & " ~ " & work_month & "-25" + End If else Response.Write work_month end if @@ -297,8 +307,19 @@ Query = Query & " and ((work_dt between '" & work_month & "-01' and '" & work_month & "-25' AND W.in_time + W.out_time + W.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " elseif work_month > "2022-04" Then - Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND W.in_time + W.out_time + W.p_sebu_code <> '000000004') OR " - Query = Query & " (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If Right(work_month, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-28' AND W.in_time + W.out_time + W.p_sebu_code <> '000000004') " + ElseIf CInt(Right(work_month, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-25' AND W.in_time + W.out_time + W.p_sebu_code <> '000000004') " + Else + '3월부터: 해당달 1일 ~ 말일 + Query = Query & " and ((work_dt between '" & work_month & "-01' and convert(varchar(10),EOMONTH(cast('" & work_month & "-01' as date)),23) AND W.in_time + W.out_time + W.p_sebu_code <> '000000004') " + End If + 'Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND W.in_time + W.out_time + W.p_sebu_code <> '000000004') " + Query = Query & " OR (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " else Query = Query & " and ((LEFT(work_dt, 7) = '" & work_month & "' AND W.in_time + W.out_time + W.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-15' as date)) as varchar) " @@ -386,8 +407,19 @@ Query = Query & " and ((work_dt between '" & work_month & "-01' and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " elseif work_month > "2022-04" Then - Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " - Query = Query & " (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If Right(work_month, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-28' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + ElseIf CInt(Right(work_month, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + Else + '3월부터: 해당달 1일 ~ 말일 + Query = Query & " and ((work_dt between '" & work_month & "-01' and convert(varchar(10),EOMONTH(cast('" & work_month & "-01' as date)),23) AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + End If + 'Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + Query = Query & " OR (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " else Query = Query & " and ((LEFT(work_dt, 7) = '" & work_month & "' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-15' as date)) as varchar) " diff --git a/approval/doc_myun_pay_detail_ajax.asp b/approval/doc_myun_pay_detail_ajax.asp index cffef95..827706d 100644 --- a/approval/doc_myun_pay_detail_ajax.asp +++ b/approval/doc_myun_pay_detail_ajax.asp @@ -46,8 +46,19 @@ Query = Query & " and ((work_dt between '" & work_month & "-01' and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " elseif work_month > "2022-04" Then - Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " - Query = Query & " (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If Right(work_month, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-28' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + ElseIf CInt(Right(work_month, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + Else + '3월부터: 해당달 1일 ~ 말일 + Query = Query & " and ((work_dt between '" & work_month & "-01' and convert(varchar(10),EOMONTH(cast('" & work_month & "-01' as date)),23) AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + End If + 'Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + Query = Query & " OR (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " else Query = Query & " and ((LEFT(work_dt, 7) = '" & work_month & "' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-15' as date)) as varchar) " diff --git a/approval/doc_myun_pay_print.asp b/approval/doc_myun_pay_print.asp index b6d4f5f..a0b58b3 100644 --- a/approval/doc_myun_pay_print.asp +++ b/approval/doc_myun_pay_print.asp @@ -321,8 +321,19 @@ query = query & " where ((work_dt between '" & work_month & "-01' and '" & work_month & "-25' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') OR " query = query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " elseif work_month > "2022-04" Then - query = query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') OR " - query = query & " (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If Right(work_month, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + query = query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-28' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') " + ElseIf CInt(Right(work_month, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + query = query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-25' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') " + Else + '3월부터: 해당달 1일 ~ 말일 + query = query & " where ((work_dt between '" & work_month & "-01' and convert(varchar(10),EOMONTH(cast('" & work_month & "-01' as date)),23) AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') " + End If + 'query = query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') " + query = query & " OR (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " else query = query & " where ((LEFT(work_dt, 7) = '" & work_month & "' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') OR " query = query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-15' as date)) as varchar) " @@ -341,7 +352,18 @@ query = query & " where ((work_dt between '" & work_month & "-01' and '" & work_month & "-25' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') OR " query = query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " elseif work_month > "2022-04" Then - query = query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') OR " + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If Right(work_month, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + query = query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-28' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') " + ElseIf CInt(Right(work_month, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + query = query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-25' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') " + Else + '3월부터: 해당달 1일 ~ 말일 + query = query & " where ((work_dt between '" & work_month & "-01' and convert(varchar(10),EOMONTH(cast('" & work_month & "-01' as date)),23) AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') " + End If + 'query = query & " where ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') OR " query = query & " (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " else query = query & " where ((LEFT(work_dt, 7) = '" & work_month & "' AND T.in_time + T.out_time + T.p_sebu_code <> '000000004') OR " @@ -350,7 +372,7 @@ query = query & " AND T.in_time + T.out_time + T.p_sebu_code = '000000004')) " query = query & " and p_sn = '" & p_sn_c & "' and isnull(T.attribute05,'') = '' " query = query & " and p_sv_no = '" & sv & "' " - query = query & " group by T.id, m_name, m_jumin, LEFT(work_dt, 7)) " + query = query & " group by T.id, m_name, m_jumin, LEFT(work_dt, 7)) " adoconn.execute query End if @@ -369,7 +391,7 @@ query = query & " left outer join neakeun_work nw on t.attribute01 = nw.id " query = query & " WHERE isnull(t.attribute05,'') = '" & krc_no & "' " query = query & " group by s_gubun, t.p_sn " - + rsc.open query, adoconn,adopenstatic, adlockreadonly do while not rsc.eof directQuery = " UPDATE direct_cost " @@ -381,7 +403,7 @@ dbin.Open adoConn dbin.Execute directQuery, i dbin.Close - + if i < 1 then Query = "select 문서번호 as krc_no from 문서내용 " query = query & " where 문서제목 = '" & replace(title, " ", "") & "' " @@ -389,7 +411,7 @@ query = query & " order by 문서번호" Rs.open Query, adoconn,adopenstatic, adlockreadonly - + if Rs.recordcount <= 0 then krc_no = 0 else @@ -399,8 +421,8 @@ end if Rs.close krc_no = int(krc_no) + 1 - tmpstr = "KRC-" & year(date) & "-" - tmpstr = tmpstr & "X-" + tmpstr = "KRC-" & year(date) & "-" + tmpstr = tmpstr & "X-" krc_no = tmpstr & ZeroFormat(krc_no,5) Query = " insert into direct_cost(p_sn, krc_no, p_subject, hangmok, sebu, act_money, " @@ -432,14 +454,14 @@ rsc.close Else alert2 "이미 결재가 완료된 문서입니다." - End if + End if End if '---------------------------------------------------------------------------------- elseif cint(print_type) = 1 then - - end if + + end if %> @@ -507,7 +529,7 @@ var url = "doc_myun_pay_print.asp" url = url + "?print_type=2"; document.frm_money.action=url; - + var dataCount = document.frm_money.dataCount.value; var minus_money_flag = "False"; var p_progress_status; //수행계획서 결재 여부 @@ -565,16 +587,16 @@ return false; } } - + } } - + document.frm_money.submit(); } /* function direct_cost_detail(p_child_sn, work_month, sv, pay_type, cost_type, d_no, work_kind) { url = "doc_myun_pay_detail.asp?p_child_sn=" + p_child_sn + "&work_month=" + work_month + "&sv=" + sv + "&pay_type=" + pay_type + "&cost_type=" + cost_type + "&krc_no=" + d_no + "&work_kind=" + escape(work_kind); - window.open(url,"","left=50 ,top=0, menubar=no, location=no ,status=no ,toolbar=no ,width=780, height=600 ,scrollbars=yes ,resizable=yes"); + window.open(url,"","left=50 ,top=0, menubar=no, location=no ,status=no ,toolbar=no ,width=780, height=600 ,scrollbars=yes ,resizable=yes"); } */ function print_ie() @@ -585,14 +607,14 @@ if(window.PPClose === false){ // Close not OK? return 'Leaving this page will block the parent window!\nPlease select "Stay on this Page option" and use the\nCancel button instead to close the Print Preview Window.\n'; } - } + } window.print(); // Print preview window.PPClose = true; // Set Close Flag to OK. }else{ - window.print(); + window.print(); window.close(); } - } + } function clsit() { @@ -616,10 +638,10 @@ - - - - + + + + @@ -633,7 +655,7 @@ <%if approval_chk = "true" then%> <%else - Response.Write "본부가 혼재된 프로젝트는 결재 상신이 안됩니다. 본부를 구분하세요" + Response.Write "본부가 혼재된 프로젝트는 결재 상신이 안됩니다. 본부를 구분하세요" end if%> @@ -658,7 +680,7 @@ tmp_title = "대표이사" else tmp_title = "부회장" - end if%> + end if%> 기안/승인(소속부서) @@ -837,7 +859,7 @@ set adors2 = server.CreateObject("ADODB.RECORDSET") query = "select p_name from person where p_no = '" & sv & "' " adors2.open query, adoconn, adopenstatic, adlockreadonly - + If adors2.recordCount > 0 Then pay_apply_username = adors2("p_name") End If @@ -852,10 +874,21 @@ if work_month = "2022-04" Then Response.Write work_month & "-01 ~ " & work_month & "-25" elseif work_month > "2022-04" Then - Response.Write DATEADD("m",-1,cdate(work_month & "-26")) & " ~ " & work_month & "-25" + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If CDate(work_month & "-01") >= CDate("2026-03-01") Then + '2026년 3월부터 1일 ~ 말일 + Response.Write CDate(work_month & "-01") & " ~ " & DateAdd("d",-1,DateAdd("m",1,CDate(work_month & "-01"))) + ElseIf CDate(work_month & "-01") = CDate("2026-02-01") Then + '2026년 2월만: 전달 26일 ~ 이번달 말일 + Response.Write DateAdd("m",-1, CDate(work_month & "-26")) & " ~ " & DateAdd("d",-1,DateAdd("m",1,CDate(work_month & "-01"))) + Else + '2026년 3월이전은 전달 26일 ~ 이번달 25일 + Response.Write DATEADD("m",-1,cdate(work_month & "-26")) & " ~ " & work_month & "-25" + End If + 'Response.Write DATEADD("m",-1,cdate(work_month & "-26")) & " ~ " & work_month & "-25" else Response.Write work_month - end if + end if %> 수당 담당자 <%=pay_apply_username%> @@ -873,7 +906,7 @@ 지출결의비용 예상잔액 사유 - + <% Query = "select d_no, p_sn, isnull(p_subject, (select p_subject from V_PROJECT_METHOD where p_sn = T.p_sn )) as p_subject, s_gubun, isnull(SUM(pay), 0) as pay, isnull(SUM(lunch), 0) as lunch, isnull(SUM(dinner), 0) as dinner " @@ -884,15 +917,15 @@ Query = Query & " , s_gubun, pay_type " Query = Query & " , CASE WHEN s_gubun <> '추가수당1' and s_gubun <> '추가수당2' THEN isnull(SUM(s_sum), 0) END as pay " Query = Query & " , CASE WHEN s_gubun = '추가수당1' THEN isnull(sum(s_wan), 0) * (select cost from t_neakeun_pay_COST where type = 'lunch') END as lunch " - Query = Query & " , CASE WHEN s_gubun = '추가수당2' THEN isnull(sum(s_wan), 0) * (select cost from t_neakeun_pay_COST where type = 'dinner') END as dinner " + Query = Query & " , CASE WHEN s_gubun = '추가수당2' THEN isnull(sum(s_wan), 0) * (select cost from t_neakeun_pay_COST where type = 'dinner') END as dinner " Query = Query & " , p_progress_status, CASE WHEN nw.id IS NULL THEN 'N' else 'Y' end AS id " - Query = Query & " from " + Query = Query & " from " Query = Query & " ( " Query = Query & " select tmp.p_sn, tmp.m_name, tmp.m_jumin, tmp.work_dt, tmp.attribute01, tmp.attribute05, tmp.pay_type, tmp.s_wan, " Query = Query & " case when tmp.s_gubun like '추가%' then " Query = Query & " ( " Query = Query & " select top 1 s_gubun " - Query = Query & " from t_neakeun_pay " + Query = Query & " from t_neakeun_pay " Query = Query & " where attribute01 = tmp.attribute01 " Query = Query & " and p_sn = tmp.p_sn and s_gubun not like '추가%' " Query = Query & " order by s_wan desc " @@ -910,8 +943,19 @@ Query = Query & " and ((work_dt between '" & work_month & "-01' and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " elseif work_month > "2022-04" Then - Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " - Query = Query & " (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If Right(work_month, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-28' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + ElseIf CInt(Right(work_month, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date)) as varchar(10)) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + Else + '3월부터: 해당달 1일 ~ 말일 + Query = Query & " and ((work_dt between '" & work_month & "-01' and convert(varchar(10),EOMONTH(cast('" & work_month & "-01' as date)),23) AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + End If + 'Query = Query & " and ((work_dt between cast(DATEADD(m,-1,cast('" & work_month & "-26' as date))as varchar) and '" & work_month & "-25' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') " + Query = Query & " OR (work_dt between '" & work_month & "-06' and cast(DATEADD(m,1,cast('" & work_month & "-05' as date)) as varchar) " else Query = Query & " and ((LEFT(work_dt, 7) = '" & work_month & "' AND NW.in_time + NW.out_time + NW.p_sebu_code <> '000000004') OR " Query = Query & " (work_dt between '" & work_month & "-16' and cast(DATEADD(m,1,cast('" & work_month & "-15' as date)) as varchar) " diff --git a/inspection/Ajax_Money.asp b/inspection/Ajax_Money.asp index 174bb81..f65567f 100644 --- a/inspection/Ajax_Money.asp +++ b/inspection/Ajax_Money.asp @@ -28,7 +28,18 @@ if MoneyDate = "2022-04" Then elseif MoneyDate > "2022-04" Then '''''''''''''''''''20230807 박준성 하지윤 선임의 지결 누락으로 인한 하드코드로 특정 문서 2023-07월에 나올수 있도록 수정 '''''''''''''''''''query = query &" and work_dt between cast(DATEADD(m,-1,cast('"&MoneyDate&"-26' as date))as varchar) and '"&MoneyDate&"-25' " - query = query &" and ( work_dt between cast(DATEADD(m,-1,cast('"&MoneyDate&"-26' as date))as varchar) and '"&MoneyDate&"-25' " + '최남식 :: 20260225 :: 수당 결재 기간 변경 + If Right(MoneyDate, 2) = "02" Then + '2월: 전달 26일 ~ 2월 28일(고정) + query = query & " and (work_dt between cast(DATEADD(m,-1,cast('" & MoneyDate & "-26' as date)) as varchar(10)) and '" & MoneyDate & "-28' " + ElseIf CInt(Right(MoneyDate, 2)) < 3 Then + '2월 이전(1월 등): 전달 26일 ~ 해당달 25일 + query = query & " and (work_dt between cast(DATEADD(m,-1,cast('" & MoneyDate & "-26' as date)) as varchar(10)) and '" & MoneyDate & "-25' " + Else + '3월부터: 해당달 1일 ~ 말일 + query = query & " and (work_dt between '" & MoneyDate & "-01' and convert(varchar(10),EOMONTH(cast('" & MoneyDate & "-01' as date)),23) " + End If + 'query = query &" and ( work_dt between cast(DATEADD(m,-1,cast('"&MoneyDate&"-26' as date))as varchar) and '"&MoneyDate&"-25' " query = query &" or ( '"&MoneyDate&"' = '2023-07' and TMP.attribute05 in ('KRC-2023-t-00507','KRC-2023-t-00506','KRC-2023-t-00505')))" '''''''''''''''''''20241205 이재은 조민아 책임의 내근직 수당 지결 누락으로 인한 하드코드로 특정 문서 수당관리(n) 2024-11월에 나올수 있도록 수정 but 반영 취소 ' query = query &" or ( '"&MoneyDate&"' = '2023-07' and TMP.attribute05 in ('KRC-2023-t-00507','KRC-2023-t-00506','KRC-2023-t-00505'))" @@ -53,7 +64,7 @@ query = query &" where D.d_order_cnt = '77'"&VbCrlf if MoneyDate = "2022-04" Then query = query &" and D.d_write_date between '"&MoneyDate&"-16' and cast(DATEADD(m,1,cast('"&MoneyDate&"-05' as date)) as varchar)"&VbCrlf elseif MoneyDate > "2022-04" Then - query = query &" and D.d_write_date between '"&MoneyDate&"-06' and cast(DATEADD(m,1,cast('"&MoneyDate&"-05' as date)) as varchar)"&VbCrlf + query = query &" and D.d_write_date between '"&MoneyDate&"-06' and cast(DATEADD(m,1,cast('"&MoneyDate&"-10' as date)) as varchar)"&VbCrlf else query = query &" and D.d_write_date between '"&MoneyDate&"-16' and cast(DATEADD(m,1,cast('"&MoneyDate&"-15' as date)) as varchar)"&VbCrlf end if @@ -73,7 +84,7 @@ query = query &" where TMP.confirm_yn = 'Y' and s_sum <> '0' and D.d_order_c if MoneyDate = "2022-04" Then query = query &" and D.d_write_date between '"&MoneyDate&"-16' and cast(DATEADD(m,1,cast('"&MoneyDate&"-05' as date)) as varchar)"&VbCrlf elseif MoneyDate > "2022-04" Then - query = query &" and D.d_write_date between '"&MoneyDate&"-06' and cast(DATEADD(m,1,cast('"&MoneyDate&"-05' as date)) as varchar)"&VbCrlf + query = query &" and D.d_write_date between '"&MoneyDate&"-06' and cast(DATEADD(m,1,cast('"&MoneyDate&"-10' as date)) as varchar)"&VbCrlf else query = query &" and D.d_write_date between '"&MoneyDate&"-16' and cast(DATEADD(m,1,cast('"&MoneyDate&"-15' as date)) as varchar)"&VbCrlf end if