diff --git a/WebContent/ui/cfs/fine/FN053M01.xml b/WebContent/ui/cfs/fine/FN053M01.xml index aa8cd00..e05cb5c 100644 --- a/WebContent/ui/cfs/fine/FN053M01.xml +++ b/WebContent/ui/cfs/fine/FN053M01.xml @@ -239,7 +239,7 @@ scwin.btn_prt_onclick = function(e) { - + @@ -533,7 +533,7 @@ scwin.btn_prt_onclick = function(e) { - + \ No newline at end of file diff --git a/src/main/java/cfs/fine/dao/FinePmDao.java b/src/main/java/cfs/fine/dao/FinePmDao.java index e044f1d..17753cc 100644 --- a/src/main/java/cfs/fine/dao/FinePmDao.java +++ b/src/main/java/cfs/fine/dao/FinePmDao.java @@ -72,10 +72,6 @@ public interface FinePmDao { public void FineupdateSec(FinePmVO finePmVO); - public List findFinePenCompare(FinePmVO finePmVO); - public List findAddiCon(FinePmVO finePmVO); - - public List findNonpayCompl(FinePmVO finePmVO); } diff --git a/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml b/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml index 2ea4815..39bf327 100644 --- a/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml +++ b/src/main/java/cfs/fine/dao/mapper/FinePm_mapper.xml @@ -1,7 +1,8 @@ - + + @@ -10,450 +11,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select aa.t_year||'/'||aa.t_month as tt_year @@ -2308,6 +2213,15 @@ order by t_year + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SELECT B.PENALTY_MANAGE_YEAR - , B.FARE_OFFICE_ID - , SUM(CASE WHEN RECEIPT_DT - END21 THEN 1 ELSE 0 END) CNT1 - , SUM(CASE WHEN RECEIPT_DT - END21 THEN B.FINE_AMOUNT + B.PASS_AMOUNT ELSE 0 END) AMOUNT1 - , SUM(CASE WHEN RECEIPT_DT - END21 THEN 1 ELSE 0 END) CNT21 - , SUM(CASE WHEN RECEIPT_DT - END21 THEN RECEIPT_AMOUNT ELSE 0 END) AMOUNT21 - , SUM(CASE WHEN RECEIPT_DT ]]> - END31 THEN 1 ELSE 0 END) OCNT31 - , SUM(CASE WHEN RECEIPT_DT ]]> - END31 THEN B.FINE_AMOUNT + B.PASS_AMOUNT ELSE 0 END) OAMOUNT31 - , SUM(CASE WHEN RECEIPT_DT ]]> - END31 THEN 1 ELSE 0 END) CNT31 - , SUM(CASE WHEN RECEIPT_DT ]]> - END31 THEN RECEIPT_AMOUNT ELSE 0 END) AMOUNT31 - , SUM(CASE WHEN RECEIPT_DT ]]> - END21 AND RECEIPT_DT - END31 THEN 1 ELSE 0 END) CNT0 - , SUM(CASE WHEN RECEIPT_DT ]]> - END21 AND RECEIPT_DT - END31 THEN RECEIPT_AMOUNT ELSE 0 END) AMOUNT0 - FROM PENALTY_STEP_INFO A - , PENALTY_DETAIL_INFO_DAMO B - WHERE A.PENALTY_MANAGE_YEAR = - B.PENALTY_MANAGE_YEAR - AND A.PENALTY_SEQNO = B.PENALTY_SEQNO - AND ( (#{dtType} = '1' AND A.YEAR||A.MONTH||A.DAY BETWEEN #{inStDate} AND - #{inEdDate}) - OR (#{dtType} = '2' AND A.RECEIPT_DT BETWEEN #{inStDate} AND #{inEdDate}) - ) - - AND B.FARE_OFFICE_ID IN #{fareOfficeId} - - GROUP BY B.PENALTY_MANAGE_YEAR, B.FARE_OFFICE_ID - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/cfs/fine/service/FinePmService.java b/src/main/java/cfs/fine/service/FinePmService.java index 1ec658d..bf5f8ab 100644 --- a/src/main/java/cfs/fine/service/FinePmService.java +++ b/src/main/java/cfs/fine/service/FinePmService.java @@ -69,11 +69,7 @@ import cfs.fine.vo.FinePmVO; public void FineupdateSec(FinePmVO finePmVO) throws Exception; - public List findFinePenCompare(FinePmVO finePmVO) throws Exception; - - public List findAddiCon(FinePmVO finePmVO) throws Exception; - - public List findNonpayCompl(FinePmVO finePmVO) throws Exception; + } diff --git a/src/main/java/cfs/fine/service/impl/FinePmServiceImpl.java b/src/main/java/cfs/fine/service/impl/FinePmServiceImpl.java index 0ceaeb9..f0dab28 100644 --- a/src/main/java/cfs/fine/service/impl/FinePmServiceImpl.java +++ b/src/main/java/cfs/fine/service/impl/FinePmServiceImpl.java @@ -218,59 +218,10 @@ public class FinePmServiceImpl implements FinePmService { FinePmDao.mergeRollCancelPopDel(finePmVO); } - @Override - public List findFinePenCompare(FinePmVO finePmVO) throws Exception { - List result = FinePmDao.findFinePenCompare(finePmVO); - for(FinePmVO setData : result){ - if(setData.getFareOfficeInfo().equals("01")){ - setData.setFareOfficeInfo("제1요금소"); - }else{ - setData.setFareOfficeInfo("제3요금소"); - } - } - return result; - } - - @Override - public List findAddiCon(FinePmVO finePmVO) throws Exception { - List result = FinePmDao.findAddiCon(finePmVO); - for(FinePmVO setData : result){ - if(setData.getFareOfficeInfo().equals("01")){ - setData.setFareOfficeInfo("제1호터널"); - }else{ - setData.setFareOfficeInfo("제3호터널"); - } - if(setData.getGroupCode().substring(4, 6).equals("01")){ - setData.setGroupCode(setData.getGroupCode().substring(0,4)+"년 제1호터널"); - }else{ - setData.setGroupCode(setData.getGroupCode().substring(0,4)+"년 제3호터널"); - } - double elapDt = Double.parseDouble(setData.getElapsedDate())*30; - double payRate = Double.parseDouble(setData.getPaymentRate()); - int mon = (int)elapDt/30; - int day = (int)(elapDt*-1); - setData.setElapsedDate(mon+"개월"+day+"일"); - if(elapDt>0){ - setData.setMotionNm((int)elapDt+"개월"+(int)(payRate*100*elapDt)); - }else if(elapDt==0){ - setData.setMotionNm("00개월"); - }else{ - if(elapDt==-9){ - setData.setMotionNm("사전통지기간"); - }else{ - setData.setMotionNm("1차고지기간"); - } - } - } - return result; - } - @Override - public List findNonpayCompl(FinePmVO finePmVO) throws Exception { - List result = FinePmDao.findNonpayCompl(finePmVO); - return result; - } + + } diff --git a/src/main/java/cfs/fine/web/FinePmController.java b/src/main/java/cfs/fine/web/FinePmController.java index 755c15f..8e0a040 100644 --- a/src/main/java/cfs/fine/web/FinePmController.java +++ b/src/main/java/cfs/fine/web/FinePmController.java @@ -55,7 +55,7 @@ public class FinePmController { result.setData("result", statList); result.setMsg(Result.STATUS_SUCESS, "정상적으로 조회가 완료되었습니다."); - download(param, request, response, null, "템플릿"); + }catch(RuntimeException e) { result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); }catch (Exception ex) { @@ -64,35 +64,7 @@ public class FinePmController { return result.getResult(); } - /** - * - * 요금소별 부과고지미납 감면대상 건수,금액 조회 - * @author cfs02 - * @task [FN53] 조회 - * @param param - * @return - * - */ - public void download(@RequestBody ParamBean param,HttpServletRequest request, HttpServletResponse response, Map beans, String filename) throws InvalidFormatException { - FinePmVO finePmVO = param.getParam(); - Result result = new Result(); - - try { - List list= FinePmService.findFinePmList(finePmVO); - - /*String tempPath = request.getSession().getServletContext().getRealPath("/resources/excel/template"); - InputStream is = new BufferedInputStream(new FileInputStream("C:\\dev\\workspace\\test.jxls\\object_collection_template.xlsx")); - OutputStream os = new FileOutputStream("C:\\dev\\workspace\\test.jxls\\test_output.xlsx"); - Context context = new Context(); - context.putVar("employees", list); - JxlsHelper.getInstance().processTemplate(is, os, context);*/ - }catch(RuntimeException e) { - result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); - }catch (Exception ex) { - result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); - } - - } + /** * 비부과 대상차량 현황,비부과 대상차량 현황Cnt, 비부과 대상차량 내용 현황 * @author cfs02 @@ -716,89 +688,11 @@ public class FinePmController { } } - /** - * - * 과태료 납부 비교 - * @author cfs02 - * @task [FN69] 조회 - * @param param - * @return - * - */ - @RequestMapping(value="/cfs/fine/findFinePenCompare.do", method=RequestMethod.POST) - public @ResponseBody Map findFinePenCompare(@RequestBody ParamBean param, HttpServletRequest request) { - FinePmVO finePmVO = param.getParam(); - - Result result = new Result(); - List statList = null; - try { - statList = FinePmService.findFinePenCompare(finePmVO); - result.setData("result", statList); - result.setMsg(Result.STATUS_SUCESS, "정상적으로 조회가 완료되었습니다."); - }catch(RuntimeException e) { - result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); - }catch (Exception ex) { - result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); - } - - return result.getResult(); - } - /** - * - * 가산금 부과별 납부현황 - * @author cfs02 - * @task [FN70] 조회 - * @param param - * @return - * - */ - @RequestMapping(value="/cfs/fine/findAddiCon.do", method=RequestMethod.POST) - public @ResponseBody Map findAddiCon(@RequestBody ParamBean param, HttpServletRequest request) { - FinePmVO finePmVO = param.getParam(); - - Result result = new Result(); - List statList = null; - try { - statList = FinePmService.findAddiCon(finePmVO); - result.setData("result", statList); - result.setMsg(Result.STATUS_SUCESS, "정상적으로 조회가 완료되었습니다."); - }catch(RuntimeException e) { - result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); - }catch (Exception ex) { - result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); - } - - return result.getResult(); - } - /** - * - * 가산금 부과별 납부현황 - * @author cfs02 - * @task [FN71] 조회 - * @param param - * @return - * - */ - @RequestMapping(value="/cfs/fine/findNonpayCompl.do", method=RequestMethod.POST) - public @ResponseBody Map findNonpayCompl(@RequestBody ParamBean param, HttpServletRequest request) { - FinePmVO finePmVO = param.getParam(); - - Result result = new Result(); - List statList = null; - try { - statList = FinePmService.findNonpayCompl(finePmVO); - result.setData("result", statList); - result.setMsg(Result.STATUS_SUCESS, "정상적으로 조회가 완료되었습니다."); - }catch(RuntimeException e) { - result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); - }catch (Exception ex) { - result.setErrorMsg(Result.STATUS_ERROR, Result.STATUS_ERROR_MESSAGE); - } - - return result.getResult(); - } + + + }