From 30853541ff16d49915cbd6fb8465c0478f399c16 Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 26 Jun 2024 18:26:30 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=20=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EB=B0=8F=20=EC=A3=BC=EC=84=9D=20=EC=A0=95=EB=A6=AC?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/sprt/web/Sprt02Controller.java | 62 +- .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 4 +- .../WEB-INF/jsp/fims/epst/epst02010-main.jsp | 2 +- .../WEB-INF/jsp/fims/epst/epst02030-main.jsp | 7 +- .../WEB-INF/jsp/fims/excl/excl01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/excl/excl02010-main.jsp | 16 +- .../WEB-INF/jsp/fims/excl/excl03010-main.jsp | 2 +- .../WEB-INF/jsp/fims/levy/levy01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/levy/levy01050-main.jsp | 2 +- .../WEB-INF/jsp/fims/levy/levy02010-main.jsp | 16 +- .../WEB-INF/jsp/fims/rcvm/rcvm01010-main.jsp | 641 +++++++++--------- .../WEB-INF/jsp/fims/sndb/sndb01010-main.jsp | 548 ++++++++------- .../WEB-INF/jsp/fims/sndb/sndb01030-main.jsp | 400 ++++++----- .../WEB-INF/jsp/fims/sndb/sndb01070-main.jsp | 400 ++++++----- .../WEB-INF/jsp/fims/sndb/sndb01090-main.jsp | 388 ++++++----- .../WEB-INF/jsp/fims/sndb/sndb01110-main.jsp | 426 ++++++------ .../WEB-INF/jsp/fims/sndb/sndb01120-info.jsp | 2 - .../WEB-INF/jsp/fims/sndb/sndb01220-main.jsp | 591 ++++++++-------- .../WEB-INF/jsp/fims/sndb/sndb01240-main.jsp | 382 ++++++----- .../WEB-INF/jsp/fims/sprt/sprt02010-main.jsp | 631 ++++++++--------- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 284 ++++---- .../WEB-INF/jsp/fims/sprt/sprt02030-info.jsp | 49 +- .../WEB-INF/jsp/fims/sprt/sprt02040-info.jsp | 257 +++---- .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt02060-info.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt02070-info.jsp | 2 +- .../WEB-INF/jsp/fims/sprt/sprt02080-info.jsp | 2 +- 27 files changed, 2518 insertions(+), 2604 deletions(-) diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index c4e826f2..74a59d7a 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -124,7 +124,8 @@ public class Sprt02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02010-main"); - return mav.addObject("callControlName", req.getCallControlName()) + return mav + .addObject("callControlName", req.getCallControlName()) .addObject("callPurpose", req.getCallPurpose()) .addObject("pageName", "sprt02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("pageNameMain", "sprt02010") // 개별총정보 메인 화면명 @@ -143,22 +144,21 @@ public class Sprt02Controller extends ApplicationController { @RequestMapping(name="개별총정보 단속, 납부자 정보 조회", value=METHOD_URL.getCrdnPayerInfo) public ModelAndView getCrdnPayerInfo(SprtQuery req) { // 단속(TB_CRDN), 납부자(TB_PAYER) 정보 - DataObject crdnPayer = sprt02Service.getCrdnPayerInfo(req); + DataObject crdnPayerInfo = sprt02Service.getCrdnPayerInfo(req); boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02020-info"); - mav.addObject("pageNameMain", "sprt02010") - .addObject("pageName", "sprt02020") - .addObject("crdnPayer", json ? crdnPayer : toJson(crdnPayer)) // 단속, 납부자 정보 + mav.addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02020") // pageName + .addObject("infoPrefix", "crdnPayer") // prefix + .addObject("crdnPayerInfo", json ? crdnPayerInfo : toJson(crdnPayerInfo)) // 단속, 납부자 정보 ; - // 재조회로 호출되었다면.. + // 재 조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { - DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 - - mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 + DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 + mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 } return mav; @@ -176,31 +176,25 @@ public class Sprt02Controller extends ApplicationController { public ModelAndView getOpnnSbmsnInfo(SprtQuery req) { // 의견제출 정보 LevyExclQuery exclQuery = new LevyExclQuery(); - - if (req.getCallPurpose() == null) { - exclQuery.setCallPurpose("view"); - } else { - exclQuery.setCallPurpose(req.getCallPurpose()); - } exclQuery.setCrdnId(req.getCrdnId()); exclQuery.setDelYn(req.getDelYn()); // 의견 제출(TB_OPNN_SBMSN) 대장 조회 - DataObject opnnSbmsn = opnnSbmsnService.getOpnnSbmsnInfo(exclQuery); + DataObject opnnSbmsnInfo = opnnSbmsnService.getOpnnSbmsnInfo(exclQuery); boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02030-info"); - mav.addObject("pageNameMain", "sprt02010") - .addObject("pageName", "sprt02030") - .addObject("opnnSbmsn", json ? opnnSbmsn : toJson(opnnSbmsn)) // 의견제출 정보 + mav.addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02030") // pageName + .addObject("infoPrefix", "opnnSbmsn") // prefix + .addObject("opnnSbmsnInfo", json ? opnnSbmsnInfo : toJson(opnnSbmsnInfo)) // 의견제출 정보 ; - // 재조회로 호출되었다면.. + // 재 조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) { - DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 - mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 + DataObject totalInfo = sprt02Service.getCrdnInfo(req); // 단속(TB_CRDN) 대장 조회 + mav.addObject("totalInfo", json ? totalInfo : toJson(totalInfo)); // 단속 정보 } return mav; @@ -218,33 +212,27 @@ public class Sprt02Controller extends ApplicationController { public ModelAndView getSndngInfo(SprtQuery req) { // 발송상세 정보 SndbQuery sndbQuery = new SndbQuery(); - - if (req.getCallPurpose() == null) { - sndbQuery.setCallPurpose("view"); - } else { - sndbQuery.setCallPurpose(req.getCallPurpose()); - } sndbQuery.setCrdnId(req.getCrdnId()); sndbQuery.setDelYn(req.getDelYn()); sndbQuery.setOrderBy("SD.REG_DT, SD.SNDNG_DTL_ID DESC"); - List sndngDtl = sndngDtlService.getSndngDtls(sndbQuery); + List sndngDtls = sndngDtlService.getSndngDtls(sndbQuery); // 공시송달 정보 sndbQuery.setCrdnId(req.getCrdnId()); sndbQuery.setDelYn(req.getDelYn()); sndbQuery.setOrderBy("SV.REG_DT DESC, SV.SVBTC_ID DESC"); - List svbtc = svbtcService.getSvbtcDtls(sndbQuery); + List svbtcDtls = svbtcService.getSvbtcDtls(sndbQuery); boolean json = jsonResponse(); - ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02040-info"); - mav.addObject("pageNameMain", "sprt02010") - .addObject("pageName", "sprt02040") - .addObject("sndngDtl", json ? sndngDtl : toJson(sndngDtl)) // 발송 정보 - .addObject("svbtc", json ? svbtc : toJson(svbtc)) // 공시송달 정보 + mav.addObject("pageNameMain", "sprt02010") // pageNameMain + .addObject("pageName", "sprt02040") // pageName + .addObject("infoPrefix", "sndngDtl") // prefix + .addObject("sndngDtls", json ? sndngDtls : toJson(sndngDtls)) // 발송 상세 정보 + .addObject("svbtcDtls", json ? svbtcDtls : toJson(svbtcDtls)) // 공시송달 정보 ; // 재조회로 호출되었다면.. diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml index 61eed1b9..6b16fbb9 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -396,8 +396,8 @@ SELECT CONCAT(#{sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(OPNN_ID, 10)) + 1, 1) AS INT), 11, '0')) AS NEW_ID , (SELECT CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), LPAD(CAST(IFNULL(MAX(SUBSTRING(RCPT_NO, 5)) + 1, 1) AS INT), 6, '0')) FROM TB_OPNN_SBMSN - WHERE OPNN_ID LIKE CONCAT(#{opnnSbmsn.sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%') - AND RCPT_NO LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), '%')) AS NEW_RCPT_NO + WHERE OPNN_ID LIKE CONCAT(#{sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%') + AND RCPT_NO LIKE CONCAT(DATE_FORMAT(CURRENT_DATE, '%Y'), '%')) AS NEW_RCPT_NO FROM TB_OPNN_SBMSN WHERE OPNN_ID LIKE CONCAT(#{sggCd}, DATE_FORMAT(CURRENT_DATE, '%Y'), '%') diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp index d0b26600..30ffef50 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp @@ -535,7 +535,7 @@ }); }); - // 버튼 이벤트 + // 업무 버튼 이벤트 $("#btnCreate--${pageName}").on("click", function() { $P.fnCreate($(this).attr("title")); // 안내문 등록 }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp index 6bc1e6eb..8447b498 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp @@ -792,13 +792,12 @@ }); }); - // 발송 취소 버튼 이벤트 + // 업무 버튼 이벤트 $("#btnUpdateCancel--${pageName}").on("click", function() { - $P.fnUpdateCancle($(this).attr("title")); + $P.fnUpdateCancle($(this).attr("title")); // 발송 취소 }); - // 발송 삭제 버튼 이벤트 $("#btnRemove--${pageName}").on("click", function() { - $P.fnRemove($(this).attr("title")); + $P.fnRemove($(this).attr("title")); // 발송 삭제 }); // DataTables width 변경 조정 업무별 그리드가 존재 한다면.. crdn06010-main.jsp 참고 diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index 00fed053..41f809fa 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -696,7 +696,7 @@ }); }); - // 버튼 이벤트 + // 업무 버튼 이벤트 $("#btnUpdate--${pageName}").on("click", function() { $P.fnUpdate($(this).attr("title")); // 부과제외 수정 }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp index c61fe302..6249af43 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp @@ -836,25 +836,21 @@ }); }); - // 심의위원 관리 버튼 이벤트 + // 업무 버튼 이벤트 $("#btnDlbrMbr--${pageName}").on("click", function() { - $P.fnDlbrMbr($(this).attr("title")); + $P.fnDlbrMbr($(this).attr("title")); // 심의위원 관리 }); - // 의견제출 수정 버튼 이벤트 $("#btnUpdate--${pageName}").on("click", function() { - $P.fnUpdate($(this).attr("title")); + $P.fnUpdate($(this).attr("title")); // 의견제출 수정 }); - // 의견제출 심의 버튼 이벤트 $("#btnUpdateOpnnDlbr--${pageName}").on("click", function() { - $P.fnUpdateOpnnDlbr($(this).attr("title")); + $P.fnUpdateOpnnDlbr($(this).attr("title")); // 의견제출 심의 }); - // 의견제출 삭제 버튼 이벤트 $("#btnRemove--${pageName}").on("click", function() { - $P.fnRemove($(this).attr("title")); + $P.fnRemove($(this).attr("title")); // 의견제출 삭제 }); - // 심의의결서 출력 버튼 이벤트 $("#btnPrintDlbrDecsn--${pageName}").on("click", function() { - $P.fnPrintDlbrDecsn($(this).attr("title")); + $P.fnPrintDlbrDecsn($(this).attr("title")); // 심의의결서 출력 }); // DataTables width 변경 조정 diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp index 65f8dca2..66b31d56 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp @@ -533,7 +533,7 @@ }); }); - // 버튼 이벤트 + // 업무 버튼 이벤트 $("#btnBfrCrdnTotalInfo--${pageName}").on("click", function() { $P.fnBfrCrdnTotalInfo($(this).attr("title")); // 이전 단속정보 }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp index 32b3b428..1c1b5ec8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp @@ -667,7 +667,7 @@ }); }); - // 버튼 이벤트 + // 업무 버튼 이벤트 $("#btnCreateSlctnTrgt--${pageName}").on("click", function() { $P.fnCreateSlctnTrgt($(this).attr("title")); // 선택 대상 감경부과 등록 }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp index ff6fcb5b..b94fe974 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp @@ -35,7 +35,7 @@
- 업무구분 + 업무구분