diff --git a/WebContent/ui/cfs/income/IC006M02.xml b/WebContent/ui/cfs/income/IC006M02.xml index c9f9f2d..d7cd41b 100644 --- a/WebContent/ui/cfs/income/IC006M02.xml +++ b/WebContent/ui/cfs/income/IC006M02.xml @@ -60,11 +60,14 @@ + + + @@ -123,11 +126,14 @@ + + + @@ -216,9 +222,9 @@ scwin.btn_search_onclick = function(e) { scwin.sbm_statList_submitdone = function(e) { if (rad_kbn.getValue() == '3') { - grd_statList2.setColumnVisible( 'inDate' , false ); + grd_statList2.setColumnVisible( 'kbn' , false ); } else if (rad_kbn.getValue() == '2') { - grd_statList2.setColumnVisible( 'inDate' , true ); + grd_statList2.setColumnVisible( 'kbn' , true ); } }; @@ -273,19 +279,22 @@ scwin.btn_excel_down_onclick = function(e) { var options = {}; options.fileName = "혼잡 통행료 총괄 현황_"+com.getCurDtime()+".xlsx"; options.sheetName = "혼잡 통행료 총괄 현황"; - options.useFooter = "true"; //다운로드시 Footer를 출력 할지 여부 (true:포함) - options.useSubTotal = "true"; //다운로드시 SubTotal을 출력 할지 여부 (false:미포함) + options.useStyle = "true"; + options.useSubTotal = "true"; //다운로드시 SubTotal을 출력 할지 여부 (false:미포함) + options.useFooter = "true"; //다운로드시 Footer를 출력 할지 여부 (true:포함) options.type = "1"; options.printSet = { - fitToPage : "true" //엑셀 프린터 출력시 쪽맞춤 사용 유무 (false:미사용) - , landScape : "true" //엑셀 프린터 출력시 가로 방향 출력 유무 (false:세로) - , pageSize : "A4" //엑셀 프린터 출력시 인쇄용지 설정 (A4:A4용지) + fitToPage : "true", //엑셀 프린터 출력시 쪽맞춤 사용 유무 (false:미사용) + landScape : "true", //엑셀 프린터 출력시 가로 방향 출력 유무 (false:세로) + pageSize : "A4" //엑셀 프린터 출력시 인쇄용지 설정 (A4:A4용지) }; options.autoSizeColumn = "false"; //너비자동맞춤 설정 유무 (false:미적용) - options.useStyle = "true"; //화면의 그리드 스타일을 엑셀파일로 내려받음 - options.useFooterData = "true"; //footer 값을 서식없이 그대로 올린다. - options.type = "1"; + options.colMerge = "true"; + + if(rad_kbn.getValue() == "3"){ + options.removeColumns = ["0"]; + } if (rad_kbn.getValue() == "1"){ grd_statList1.advancedExcelDownload( options, info ); @@ -302,10 +311,21 @@ scwin.fmtInDate = function(data, formattedData, rowIndex, colIndex) { rtn = data.substr(6, 2) + "일"; } else if (kbn == '2') { rtn = data.substr(4, 2) + "월"; + } else { + rtn = data.substr(0, 4) + "년"; } return rtn; }; +scwin.fmtFareOfficeNmAvr = function(data, formattedData, rowIndex, colIndex) { + // 차로명 표시 형식 + var rtn = data; + if (Number(data) > 0) { + rtn = Number(data) + '호 일평균'; + } + return rtn; +}; + scwin.userExpFare = function(chkColID, valColID, chkStr){ //일별 if (rad_kbn.getValue() == "1"){ @@ -433,13 +453,13 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - - - - - - - - - - - - - - @@ -577,17 +582,23 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + - + - + - + + + + + @@ -658,6 +669,24 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ + + + + + + + + + + + + @@ -682,14 +711,14 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + - + - + + + + + + + + + @@ -878,13 +918,13 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - - - + + + + @@ -1040,6 +1085,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cardBeforeNormalM')" id="column357" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1048,6 +1097,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cardAfterNormalM')" id="column355" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1096,7 +1149,7 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + + @@ -1247,6 +1302,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cachNormalM') / SUM('totalM') * 100" id="column532" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1259,6 +1318,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cardBeforeNormalM') / SUM('totalM') * 100" id="column529" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1267,6 +1330,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cardAfterNormalM') / SUM('totalM') * 100" id="column527" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1316,11 +1383,11 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - - + + + + excelExpression="scwin.userExpFare('fareOfficeId','cachNormalM',"01") + scwin.userExpFare('fareOfficeId','cachLightNormalM',"01") + scwin.userExpFare('fareOfficeId','cachRfidM',"01") + scwin.userExpFare('fareOfficeId','cardBeforeNormalM',"01") + scwin.userExpFare('fareOfficeId','cardBeforeLightM',"01") + scwin.userExpFare('fareOfficeId','cardBeforeRfidM',"01") + scwin.userExpFare('fareOfficeId','cardAfterNormalM',"01") + scwin.userExpFare('fareOfficeId','cardAfterLightM',"01") + scwin.userExpFare('fareOfficeId','cardAfterRfidM',"01") + scwin.userExpFare('fareOfficeId','fixAmountNormalNormalM',"01") + scwin.userExpFare('fareOfficeId','fixAmountNormalCardM',"01") + scwin.userExpFare('fareOfficeId','fixAmountLightNormalM',"01") + scwin.userExpFare('fareOfficeId','fixAmountLightCardM',"01") - scwin.userExpFare('fareOfficeId','cardRepayM',"01")"> + + + + @@ -1491,6 +1568,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="scwin.userExpFare('fareOfficeId','cardAfterNormalM',"01")" id="column584" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1542,7 +1623,7 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + + + excelExpression="scwin.userExpFare('fareOfficeId','cachNormalM',"03") + scwin.userExpFare('fareOfficeId','cachLightNormalM',"03") + scwin.userExpFare('fareOfficeId','cachRfidM',"03") + scwin.userExpFare('fareOfficeId','cardBeforeNormalM',"03") + scwin.userExpFare('fareOfficeId','cardBeforeLightM',"03") + scwin.userExpFare('fareOfficeId','cardBeforeRfidM',"03") + scwin.userExpFare('fareOfficeId','cardAfterNormalM',"03") + scwin.userExpFare('fareOfficeId','cardAfterLightM',"03") + scwin.userExpFare('fareOfficeId','cardAfterRfidM',"03") + scwin.userExpFare('fareOfficeId','fixAmountNormalNormalM',"03") + scwin.userExpFare('fareOfficeId','fixAmountNormalCardM',"03") + scwin.userExpFare('fareOfficeId','fixAmountLightNormalM',"03") + scwin.userExpFare('fareOfficeId','fixAmountLightCardM',"03") - scwin.userExpFare('fareOfficeId','cardRepayM',"03")"> + + + + @@ -1714,6 +1805,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="scwin.userExpFare('fareOfficeId','cardAfterNormalM',"03")" id="column641" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1761,7 +1856,7 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + + + + @@ -1916,6 +2016,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cardBeforeNormalM')" id="column757" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1924,6 +2028,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cardAfterNormalM')" id="column755" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -1968,7 +2076,7 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + + @@ -2119,6 +2229,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cachNormalM') / SUM('totalM') * 100" id="column703" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -2131,6 +2245,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cardBeforeNormalM') / SUM('totalM') * 100" id="column700" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -2139,6 +2257,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cardAfterNormalM') / SUM('totalM') * 100" id="column698" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -2200,13 +2322,13 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - - - - - - - - - - - - - - @@ -2344,17 +2451,23 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + - + - + - + + + + + @@ -2425,6 +2538,24 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ + + + + + + + + + + + + @@ -2449,17 +2580,17 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - - - + + + + + + + + + @@ -2645,6 +2787,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ + + @@ -2786,6 +2932,8 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ blockSelect="false" displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" excelExpression="" expression="sum('noncltNonpayNotReadQ')/sum('cltDayCnt')"> + + @@ -2794,6 +2942,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" excelExpression="" expression="sum('cachNormalM')/sum('cltDayCnt')"> + + @@ -2806,6 +2958,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ blockSelect="false" displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" excelExpression="" expression="sum('cardBeforeNormalM')/sum('cltDayCnt')"> + + @@ -2814,6 +2970,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ blockSelect="false" displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" excelExpression="" expression="sum('cardAfterNormalM')/sum('cltDayCnt')"> + + @@ -2860,14 +3020,14 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - - - + + + @@ -3017,6 +3179,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cachNormalM')" id="cachNormalMsub" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100" excelExpression=""> + + @@ -3029,6 +3195,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cardBeforeNormalM')" id="cardBeforeNormalMsub" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100" excelExpression=""> + + @@ -3037,6 +3207,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cardAfterNormalM')" id="cardAfterNormalMsub" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100" excelExpression=""> + + @@ -3088,6 +3262,9 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ + + @@ -3227,6 +3404,8 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ blockSelect="false" displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" excelExpression="" expression="SUM('noncltNonpayNotReadQavr')"> + + @@ -3234,6 +3413,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ blockSelect="false" displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" excelExpression="" expression="SUM('cachNormalMavr')"> + + @@ -3246,6 +3429,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ blockSelect="false" displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" excelExpression="" expression="SUM('cardBeforeNormalMavr')"> + + @@ -3254,6 +3441,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ blockSelect="false" displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" excelExpression="" expression="SUM('cardAfterNormalMavr')"> + + @@ -3297,7 +3488,7 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + + @@ -3448,6 +3641,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cachNormalM') / SUM('totalM') * 100" id="column532" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100" excelExpression=""> + + @@ -3460,6 +3657,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cardBeforeNormalM') / SUM('totalM') * 100" id="column529" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100" excelExpression=""> + + @@ -3468,6 +3669,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cardAfterNormalM') / SUM('totalM') * 100" id="column527" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100" excelExpression=""> + + @@ -3517,12 +3722,11 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - - - + + + + + + + @@ -3692,6 +3906,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="scwin.userExpFare('fareOfficeId','cardAfterNormalM',"01")" id="cardAfterNormalM_01_tot" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -3743,6 +3961,9 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ + + + + + expression="SUM('cltDayCnt') == 0 ? 0 : (scwin.userExpFare('fareOfficeId','cachNormalM','01') + scwin.userExpFare('fareOfficeId','cachLightNormalM','01') + scwin.userExpFare('fareOfficeId','cachRfidM','01') + scwin.userExpFare('fareOfficeId','cardBeforeNormalM','01') + scwin.userExpFare('fareOfficeId','cardBeforeLightM','01') + scwin.userExpFare('fareOfficeId','cardBeforeRfidM','01') + scwin.userExpFare('fareOfficeId','cardAfterNormalM','01') + scwin.userExpFare('fareOfficeId','cardAfterLightM','01') + scwin.userExpFare('fareOfficeId','cardAfterRfidM','01') + scwin.userExpFare('fareOfficeId','fixAmountNormalNormalM','01') + scwin.userExpFare('fareOfficeId','fixAmountNormalCardM','01') + scwin.userExpFare('fareOfficeId','fixAmountLightNormalM','01') + scwin.userExpFare('fareOfficeId','fixAmountLightCardM','01') - scwin.userExpFare('fareOfficeId','cardRepayM','01')) / (SUM('cltDayCnt') / 2)"> + + + expression="SUM('cltDayCnt') == 0 ? 0 : (scwin.userExpFare('fareOfficeId','cardBeforeNormalM',"01") + scwin.userExpFare('fareOfficeId','cardBeforeLightM',"01") + scwin.userExpFare('fareOfficeId','cardBeforeRfidM',"01") + scwin.userExpFare('fareOfficeId','cardAfterNormalM',"01") + scwin.userExpFare('fareOfficeId','cardAfterLightM',"01") + scwin.userExpFare('fareOfficeId','cardAfterRfidM',"01") + scwin.userExpFare('fareOfficeId','cardRepayM',"01") - scwin.userExpFare('fareOfficeId','cardRepayM',"01")) / (SUM('cltDayCnt') / 2)"> + + @@ -3912,6 +4143,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" expression="SUM('cltDayCnt') == 0 ? 0 : (scwin.userExpFare('fareOfficeId','cardAfterNormalM',"01")) / (SUM('cltDayCnt') / 2)"> + + @@ -3955,8 +4190,8 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + + + + + + + @@ -4126,6 +4371,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="scwin.userExpFare('fareOfficeId','cardAfterNormalM',"03")" id="cardAfterNormalM_03_tot" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -4173,6 +4422,9 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ + + @@ -4313,26 +4565,36 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" expression="SUM('cltDayCnt') == 0 ? 0 : (scwin.userExpFare('fareOfficeId','noncltNonpayNotReadQ',"03")) / (SUM('cltDayCnt') / 2)"> + + + expression="SUM('cltDayCnt') == 0 ? 0 : (scwin.userExpFare('fareOfficeId','cachNormalM','03') + scwin.userExpFare('fareOfficeId','cachLightNormalM','03') + scwin.userExpFare('fareOfficeId','cachRfidM','03') + scwin.userExpFare('fareOfficeId','cardBeforeNormalM','03') + scwin.userExpFare('fareOfficeId','cardBeforeLightM','03') + scwin.userExpFare('fareOfficeId','cardBeforeRfidM','03') + scwin.userExpFare('fareOfficeId','cardAfterNormalM','03') + scwin.userExpFare('fareOfficeId','cardAfterLightM','03') + scwin.userExpFare('fareOfficeId','cardAfterRfidM','03') + scwin.userExpFare('fareOfficeId','fixAmountNormalNormalM','03') + scwin.userExpFare('fareOfficeId','fixAmountNormalCardM','03') + scwin.userExpFare('fareOfficeId','fixAmountLightNormalM','03') + scwin.userExpFare('fareOfficeId','fixAmountLightCardM','03') - scwin.userExpFare('fareOfficeId','cardRepayM','03')) / (SUM('cltDayCnt') / 2)"> + + + expression="SUM('cltDayCnt') == 0 ? 0 : (scwin.userExpFare('fareOfficeId','cardBeforeNormalM',"03") + scwin.userExpFare('fareOfficeId','cardBeforeLightM',"03") + scwin.userExpFare('fareOfficeId','cardBeforeRfidM',"03") + scwin.userExpFare('fareOfficeId','cardAfterNormalM',"03") + scwin.userExpFare('fareOfficeId','cardAfterLightM',"03") + scwin.userExpFare('fareOfficeId','cardAfterRfidM',"03") + scwin.userExpFare('fareOfficeId','cardRepayM',"03") - scwin.userExpFare('fareOfficeId','cardRepayM',"03")) / (SUM('cltDayCnt') / 2)"> + + @@ -4341,6 +4603,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ displayMode="label" dataType="number" displayFormat="#,##0" textAlign="right" expression="SUM('cltDayCnt') == 0 ? 0 : (scwin.userExpFare('fareOfficeId','cardAfterNormalM',"03")) / (SUM('cltDayCnt') / 2)"> + + @@ -4384,8 +4650,8 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + @@ -4525,6 +4791,8 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('noncltNonpayNotReadQ')" id="noncltNonpayNotReadQ_sub_tot" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="70"> + + @@ -4532,6 +4800,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cachNormalM')" id="cachNormalM_sub_tot" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -4544,6 +4816,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cardBeforeNormalM')" id="cardBeforeNormalM_sub_tot" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -4552,6 +4828,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('cardAfterNormalM')" id="cardAfterNormalM_sub_tot" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -4598,6 +4878,9 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ + + @@ -4738,6 +5021,8 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ displayMode="label" displayFormat="#,##0" dataType="number" textAlign="right" expression="SUM('cltDayCnt') == 0 ? 0 : SUM('noncltNonpayNotReadQ') / (SUM('cltDayCnt') / 2)"> + + @@ -4746,6 +5031,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ displayMode="label" displayFormat="#,##0" dataType="number" textAlign="right" expression="SUM('cltDayCnt') == 0 ? 0 : SUM('cachNormalM') / (SUM('cltDayCnt') / 2)"> + + @@ -4758,6 +5047,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ displayMode="label" displayFormat="#,##0" dataType="number" textAlign="right" expression="SUM('cltDayCnt') == 0 ? 0 : SUM('cardBeforeNormalM') / (SUM('cltDayCnt') / 2)"> + + @@ -4766,6 +5059,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ displayMode="label" displayFormat="#,##0" dataType="number" textAlign="right" expression="SUM('cltDayCnt') == 0 ? 0 : SUM('cardAfterNormalM') / (SUM('cltDayCnt') / 2)"> + + @@ -4809,7 +5106,7 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ - + + @@ -4960,6 +5259,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cachNormalM') / SUM('totalM') * 100" id="column703" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -4972,6 +5275,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cardBeforeNormalM') / SUM('totalM') * 100" id="column700" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + @@ -4980,6 +5287,10 @@ scwin.userExpFare = function(chkColID, valColID, chkStr){ expression="SUM('totalM') == 0 ? 0 : SUM('cardAfterNormalM') / SUM('totalM') * 100" id="column698" inputType="expression" removeBorderStyle="FALSE" textAlign="right" width="100"> + + diff --git a/src/main/java/cfs/income/dao/IncomeDao.java b/src/main/java/cfs/income/dao/IncomeDao.java index 92ff34c..0fbf4d6 100644 --- a/src/main/java/cfs/income/dao/IncomeDao.java +++ b/src/main/java/cfs/income/dao/IncomeDao.java @@ -60,16 +60,13 @@ public interface IncomeDao { List findIncomeFareOfficeStatList_kbn_1(IncomeParamsVO incomeParamsVO); List findIncomeFareOfficeStatList_kbn_2(IncomeParamsVO incomeParamsVO); List findIncomeFareOfficeStatList_kbn_3(IncomeParamsVO incomeParamsVO); - - /* 혼잡 통행료 총괄 현황 [IC006] */ - List findIncomeGeneralMngStatList_kbn_1(IncomeParamsVO incomeParamsVO); - List findIncomeGeneralMngStatList_kbn_2(IncomeParamsVO incomeParamsVO); - List findIncomeGeneralMngStatList_kbn_3(IncomeParamsVO incomeParamsVO); /* 혼잡 통행료 총괄 현황 [IC006] */ List findIncomeGeneralMngStatNonHldyList_kbn_1(IncomeParamsVO incomeParamsVO); - List findIncomeGeneralMngStatNonHldyList_kbn_2(IncomeParamsVO incomeParamsVO); - List findIncomeGeneralMngStatNonHldyList_kbn_3(IncomeParamsVO incomeParamsVO); + /* 혼잡 통행료 총괄 현황 [IC006] */ + List findIncomeGeneralMngStatList_kbn_2(IncomeParamsVO incomeParamsVO); + List findIncomeGeneralMngStatList_kbn_3(IncomeParamsVO incomeParamsVO); + /* 평일/토요일 수입금 현황(1) [IC007] */ List findIncomeSatStatOneList(IncomeParamsVO incomeParamsVO); diff --git a/src/main/java/cfs/income/dao/mapper/Income_mapper.xml b/src/main/java/cfs/income/dao/mapper/Income_mapper.xml index ca6b66e..49259ff 100644 --- a/src/main/java/cfs/income/dao/mapper/Income_mapper.xml +++ b/src/main/java/cfs/income/dao/mapper/Income_mapper.xml @@ -1804,10 +1804,13 @@ + + + @@ -1819,24 +1822,10 @@ + - + WITH TB AS (SELECT YEAR || MONTH || DAY AS IN_DATE , FARE_OFFICE_ID , NVL(SUM(NVL(IN_EXEMPTION_QUANTITY,0) + NVL(OUT_EXEMPTION_QUANTITY,0)),0) AS V_FREE_Q , NVL(SUM(NVL(IN_CASH_QUANTITY,0) + NVL(OUT_CASH_QUANTITY,0)),0) AS V_CASH_Q @@ -1970,9 +1959,9 @@ SELECT A.* , (NONCLT_NONPAY_SUM_Q - NONCLT_NONPAY_CASH_Q - NONCLT_NONPAY_PENALTY_Q - NONCLT_NONPAY_EXEMPT_Q - NONCLT_NONPAY_NOT_CONFIRM_Q) AS NONCLT_NONPAY_NOT_READ_Q FROM ( - SELECT SUBSTR(TA.IN_DATE,1,6) AS KBN - , TA.IN_DATE - , TA.FARE_OFFICE_ID + SELECT SUBSTR(TB.IN_DATE,1,6) AS KBN + , TB.IN_DATE + , TB.FARE_OFFICE_ID , NVL(TB.V_CASH_Q,0) + NVL(TC.V_CASH_Q1,0) AS CLT_CASH_NORMAL_Q , NVL(TB.V_K_CASH_Q,0) + NVL(TC.V_K_CASH_Q1,0) - NVL(TB.OUT_RFID_CASH_Q,0) AS CLT_CASH_LIGHT_NORMAL_Q , TB.OUT_RFID_CASH_Q AS CLT_CASH_LIGHT_RFID_Q @@ -1997,12 +1986,15 @@ , NVL(TE.NONCLT_NONPAY_PENALTY_Q,0) AS NONCLT_NONPAY_PENALTY_Q , NVL(TE.NONCLT_NONPAY_EXEMPT_Q,0) AS NONCLT_NONPAY_EXEMPT_Q , NVL(TE.NONCLT_NONPAY_NOT_CONFIRM_Q,0) AS NONCLT_NONPAY_NOT_CONFIRM_Q - , NVL(TB.V_CASH_M,0) + NVL(TC.V_CASH_M1,0) + NVL(TB.V_K_CASH_M,0) + NVL(TC.V_K_CASH_M1,0) - NVL(TB.OUT_RFID_CASH_M,0) AS CACH_NORMAL_M - , TB.OUT_RFID_CASH_M AS CACH_RFID_M - , TB.OUT_CARD_BEFORE_M + NVL(TB.OUT_K_SUN_M,0) - NVL(TB.OUT_RFID_SUN_M,0) AS CARD_BEFORE_NORMAL_M - , TB.OUT_RFID_SUN_M AS CARD_BEFORE_RFID_M - , TB.OUT_CARD_AFTER_M + NVL(TB.OUT_K_WHO_M,0) - NVL(TB.OUT_RFID_WHO_M,0) AS CARD_AFTER_NORMAL_M - , TB.OUT_RFID_WHO_M AS CARD_AFTER_RFID_M + , NVL(TB.V_CASH_M,0) + NVL(TC.V_CASH_M1,0) AS CACH_NORMAL_M + , NVL(TB.V_K_CASH_M,0) + NVL(TC.V_K_CASH_M1,0) - NVL(TB.OUT_RFID_CASH_M,0) AS CACH_LIGHT_NORMAL_M + , TB.OUT_RFID_CASH_M AS CACH_RFID_M + , TB.OUT_CARD_BEFORE_M AS CARD_BEFORE_NORMAL_M + , NVL(TB.OUT_K_SUN_M,0) - NVL(TB.OUT_RFID_SUN_M,0) AS CARD_BEFORE_LIGHT_M + , TB.OUT_RFID_SUN_M AS CARD_BEFORE_RFID_M + , TB.OUT_CARD_AFTER_M AS CARD_AFTER_NORMAL_M + , NVL(TB.OUT_K_WHO_M,0) - NVL(TB.OUT_RFID_WHO_M,0) AS CARD_AFTER_LIGHT_M + , TB.OUT_RFID_WHO_M AS CARD_AFTER_RFID_M , TB.OUT_REPAY_M AS CARD_REPAY_M , NVL(TB.V_SALE_Q,0) + NVL(TC.V_SALE_Q1,0) + + NVL(V_K_SALE_Q,0) AS FIX_CNT_Q , NVL(TB.V_SALE_M,0) + NVL(TC.V_SALE_M1,0) AS FIX_AMOUNT_NORMAL_NORMAL_M @@ -2010,21 +2002,18 @@ , NVL(TB.V_K_SALE_M,0) + NVL(TC.V_K_SALE_M1,0) AS FIX_AMOUNT_LIGHT_NORMAL_M , NVL(TF.FIX_AMOUNT_LIGHT_CARD_M,0) AS FIX_AMOUNT_LIGHT_CARD_M , 1 AS CLT_DAY_CNT - FROM TA, TB, TC, TD, TE, TF - WHERE TA.IN_DATE = TB.IN_DATE(+) - AND TA.FARE_OFFICE_ID = TB.FARE_OFFICE_ID(+) - AND TA.IN_DATE = TC.IN_DATE(+) - AND TA.FARE_OFFICE_ID = TC.P_BRANCH(+) - AND TA.IN_DATE = TD.IN_DATE(+) - AND TA.FARE_OFFICE_ID = TD.FARE_OFFICE_ID(+) - AND TA.IN_DATE = TE.IN_DATE(+) - AND TA.FARE_OFFICE_ID = TE.FARE_OFFICE_ID(+) - AND TA.IN_DATE = TF.IN_DATE(+) - AND TA.FARE_OFFICE_ID = TF.FARE_OFFICE_ID(+) + FROM TB, TC, TD, TE, TF + WHERE TB.IN_DATE = TC.IN_DATE(+) + AND TB.FARE_OFFICE_ID = TC.P_BRANCH(+) + AND TB.IN_DATE = TD.IN_DATE(+) + AND TB.FARE_OFFICE_ID = TD.FARE_OFFICE_ID(+) + AND TB.IN_DATE = TE.IN_DATE(+) + AND TB.FARE_OFFICE_ID = TE.FARE_OFFICE_ID(+) + AND TB.IN_DATE = TF.IN_DATE(+) + AND TB.FARE_OFFICE_ID = TF.FARE_OFFICE_ID(+) ) A ORDER BY A.IN_DATE, A.FARE_OFFICE_ID - - - - - - - + + diff --git a/src/main/java/cfs/income/service/IncomeService.java b/src/main/java/cfs/income/service/IncomeService.java index fbd66a2..94862b1 100644 --- a/src/main/java/cfs/income/service/IncomeService.java +++ b/src/main/java/cfs/income/service/IncomeService.java @@ -46,12 +46,12 @@ public interface IncomeService { /* 요금소별 수입금 현황 [IC005] */ List findIncomeFareOfficeStatList(IncomeParamsVO incomeParamsVO) throws Exception; - - /* 혼잡 통행료 총괄 현황 [IC006] */ - List findIncomeGeneralMngStatList(IncomeParamsVO incomeParamsVO) throws Exception; /* 혼잡 통행료 총괄 현황 [IC006] */ List findIncomeGeneralMngStatNonHldyList(IncomeParamsVO incomeParamsVO) throws Exception; + /* 혼잡 통행료 총괄 현황 [IC006] */ + List findIncomeGeneralMngStatList(IncomeParamsVO incomeParamsVO) throws Exception; + /* 평일/토요일 수입금 현황(1) [IC007] */ List findIncomeSatStatOneList(IncomeParamsVO incomeParamsVO) throws Exception; diff --git a/src/main/java/cfs/income/service/impl/IncomeServiceImpl.java b/src/main/java/cfs/income/service/impl/IncomeServiceImpl.java index 0d869c1..1d50464 100644 --- a/src/main/java/cfs/income/service/impl/IncomeServiceImpl.java +++ b/src/main/java/cfs/income/service/impl/IncomeServiceImpl.java @@ -140,33 +140,33 @@ System.out.println("################# : findIncomeDailyClosingStatList_5"); } return list; } - + @Override - public List findIncomeGeneralMngStatList(IncomeParamsVO incomeParamsVO) throws Exception { + public List findIncomeGeneralMngStatNonHldyList(IncomeParamsVO incomeParamsVO) throws Exception { List list = null; if ("1".equals(incomeParamsVO.getKbn())) { //일별 - list = incomeDao.findIncomeGeneralMngStatList_kbn_1(incomeParamsVO); + list = incomeDao.findIncomeGeneralMngStatNonHldyList_kbn_1(incomeParamsVO); } else if ("2".equals(incomeParamsVO.getKbn())) { //월별 - list = incomeDao.findIncomeGeneralMngStatList_kbn_2(incomeParamsVO); + } else if ("3".equals(incomeParamsVO.getKbn())) { //년별 - list = incomeDao.findIncomeGeneralMngStatList_kbn_3(incomeParamsVO); + } return list; } @Override - public List findIncomeGeneralMngStatNonHldyList(IncomeParamsVO incomeParamsVO) throws Exception { + public List findIncomeGeneralMngStatList(IncomeParamsVO incomeParamsVO) throws Exception { List list = null; if ("1".equals(incomeParamsVO.getKbn())) { //일별 - list = incomeDao.findIncomeGeneralMngStatNonHldyList_kbn_1(incomeParamsVO); + } else if ("2".equals(incomeParamsVO.getKbn())) { //월별 - list = incomeDao.findIncomeGeneralMngStatNonHldyList_kbn_2(incomeParamsVO); + list = incomeDao.findIncomeGeneralMngStatList_kbn_2(incomeParamsVO); } else if ("3".equals(incomeParamsVO.getKbn())) { //년별 - list = incomeDao.findIncomeGeneralMngStatNonHldyList_kbn_3(incomeParamsVO); + list = incomeDao.findIncomeGeneralMngStatList_kbn_3(incomeParamsVO); } return list; } - + @Override public List findIncomeSatStatOneList(IncomeParamsVO incomeParamsVO) throws Exception { return incomeDao.findIncomeSatStatOneList(incomeParamsVO); diff --git a/src/main/java/cfs/income/vo/IncomeGeneralMngStatVO.java b/src/main/java/cfs/income/vo/IncomeGeneralMngStatVO.java index 37cf092..d330325 100644 --- a/src/main/java/cfs/income/vo/IncomeGeneralMngStatVO.java +++ b/src/main/java/cfs/income/vo/IncomeGeneralMngStatVO.java @@ -33,10 +33,13 @@ public class IncomeGeneralMngStatVO { private long noncltNonpayNotConfirmQ = 0; private long noncltNonpayNotReadQ = 0; private long cachNormalM = 0; + private long cachLightNormalM = 0; private long cachRfidM = 0; private long cardAfterNormalM = 0; + private long cardAfterLightM = 0; private long cardAfterRfidM = 0; private long cardBeforeNormalM = 0; + private long cardBeforeLightM = 0; private long cardBeforeRfidM = 0; private long cardRepayM = 0; private long fixCntQ = 0; @@ -324,5 +327,23 @@ public class IncomeGeneralMngStatVO { public void setPreLightQ(long preLightQ) { this.preLightQ = preLightQ; } + public long getCachLightNormalM() { + return cachLightNormalM; + } + public void setCachLightNormalM(long cachLightNormalM) { + this.cachLightNormalM = cachLightNormalM; + } + public long getCardAfterLightM() { + return cardAfterLightM; + } + public void setCardAfterLightM(long cardAfterLightM) { + this.cardAfterLightM = cardAfterLightM; + } + public long getCardBeforeLightM() { + return cardBeforeLightM; + } + public void setCardBeforeLightM(long cardBeforeLightM) { + this.cardBeforeLightM = cardBeforeLightM; + } } diff --git a/src/main/java/cfs/income/web/IncomeController.java b/src/main/java/cfs/income/web/IncomeController.java index e6bfcbf..c165846 100644 --- a/src/main/java/cfs/income/web/IncomeController.java +++ b/src/main/java/cfs/income/web/IncomeController.java @@ -234,25 +234,25 @@ System.out.println("################# : 시작 2"); return result.getResult(); } - + /** * - * 혼잡 통행료 총괄 현황 목록을 조회한다. + * 혼잡 통행료 총괄 현황 목록을 조회한다. 휴일 제외 * @author NOHEART - * @task [IC006M02] 월별,년별 조회 + * @task [IC006M02] 일별 조회 * @param param * @return * 수정내역 */ - @RequestMapping(value="/cfs/income/findIncomeGeneralMngStatList.do", method=RequestMethod.POST) - public @ResponseBody Map findIncomeGeneralMngStatList(@RequestBody ParamBean param, HttpServletRequest request) { + @RequestMapping(value="/cfs/income/findIncomeGeneralMngStatNonHldyList.do", method=RequestMethod.POST) + public @ResponseBody Map findIncomeGeneralMngStatNonHldyList(@RequestBody ParamBean param, HttpServletRequest request) { IncomeParamsVO incomeParamsVO = param.getParam(); - + Result result = new Result(); List statList = null; try { - statList = (List) incomeService.findIncomeGeneralMngStatList(incomeParamsVO); - + statList = (List) incomeService.findIncomeGeneralMngStatNonHldyList(incomeParamsVO); + result.setData("statList", statList); result.setMsg(Result.STATUS_SUCESS, "정상적으로 조회가 완료되었습니다."); }catch(RuntimeException e) { @@ -260,28 +260,28 @@ System.out.println("################# : 시작 2"); }catch (Exception ex) { result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); } - + return result.getResult(); } /** * - * 혼잡 통행료 총괄 현황 목록을 조회한다. 휴일 제외 + * 혼잡 통행료 총괄 현황 목록을 조회한다. * @author NOHEART - * @task [IC006M02] 일별 조회 + * @task [IC006M02] 월별,년별 조회 * @param param * @return * 수정내역 */ - @RequestMapping(value="/cfs/income/findIncomeGeneralMngStatNonHldyList.do", method=RequestMethod.POST) - public @ResponseBody Map findIncomeGeneralMngStatNonHldyList(@RequestBody ParamBean param, HttpServletRequest request) { + @RequestMapping(value="/cfs/income/findIncomeGeneralMngStatList.do", method=RequestMethod.POST) + public @ResponseBody Map findIncomeGeneralMngStatList(@RequestBody ParamBean param, HttpServletRequest request) { IncomeParamsVO incomeParamsVO = param.getParam(); - + Result result = new Result(); List statList = null; try { - statList = (List) incomeService.findIncomeGeneralMngStatNonHldyList(incomeParamsVO); - + statList = (List) incomeService.findIncomeGeneralMngStatList(incomeParamsVO); + result.setData("statList", statList); result.setMsg(Result.STATUS_SUCESS, "정상적으로 조회가 완료되었습니다."); }catch(RuntimeException e) { @@ -289,9 +289,11 @@ System.out.println("################# : 시작 2"); }catch (Exception ex) { result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); } - + return result.getResult(); } + + /** *