diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index 8f77c58e..20eb5b8f 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -39,8 +39,10 @@ public class Sprt01Controller extends ApplicationController { integrationSearchMain = "/010/main.do", getIntegrationDataList = "/010/list.do", manageEtcCnMain = "/020/info.do", - inputEtcCnMain = "/030/info.do", - inputEtcCn = "/030/update.do" + + inputEtcCnMain = "/100/info.do", + inputEtcCn = "/100/update.do", + printCrdnMain = "/110/info.do" ; } @@ -234,10 +236,10 @@ public class Sprt01Controller extends ApplicationController { /**특기사항 일괄 입력 화면을 연다. * - * @return /fims/sprt/sprt01030 + * @return /fims/sprt/sprt01100 */ public ModelAndView inputEtcCnMain(String... crdnIds) { - ModelAndView mav = new ModelAndView("fims/sprt/sprt01030-info"); + ModelAndView mav = new ModelAndView("fims/sprt/sprt01100-info"); mav.addObject("crdnIds", toJson(crdnIds)); @@ -263,4 +265,16 @@ public class Sprt01Controller extends ApplicationController { return mav; } + + /**단속내역서,확인서 출력 화면을 연다. + * + * @return /fims/sprt/sprt01110 + */ + public ModelAndView printCrdnMain(String... crdnIds) { + ModelAndView mav = new ModelAndView("fims/sprt/sprt01110-info"); + + mav.addObject("crdnIds", toJson(crdnIds)); + + return mav; + } } diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index cdf50408..8e8c9c03 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -360,6 +360,12 @@ public class CmnController { return super.inputEtcCn(etcCn, crdnIds); } + @Override + @RequestMapping(name="단속 내역서,확인서 출력 화면", value=METHOD_URL.printCrdnMain) + public ModelAndView printCrdnMain(String... crdnIds) { + return super.printCrdnMain(crdnIds); + } + } @Controller diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp index b8febaf2..b1a75695 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp @@ -339,7 +339,7 @@ integrationSearch.fnInputEtcCn = (updown) => { } - if(cur == null && cur.length <= 0){ + if(cur.length <= 0){ return; } @@ -347,7 +347,7 @@ integrationSearch.fnInputEtcCn = (updown) => { var grouped = Object.groupBy(list, ({ CRDN_ID }) => CRDN_ID); var crdnIds = Object.keys(grouped); - var url = wctx.url("/sprt/sprt01/030/info.do"); + var url = wctx.url("/sprt/sprt01/100/info.do"); var dialogId = "inputEtcCnDialog"; ajax.get({ @@ -373,6 +373,51 @@ integrationSearch.fnInputEtcCn = (updown) => { } + +//단속내역서,단속확인서 +integrationSearch.fnPrintCrdn = () => { + + var upDataset = integrationSearchControl.updataset; + var downDataset = integrationSearchControl.downdataset; + + if((upDataset.length <= 0) && (downDataset.length <= 0)){ + return; + } + + var upArr = upDataset.getDataset(); + var downArr = downDataset.getDataset(); + var unionArray = [...upArr, ...downArr]; + + var crdnIds = Object.keys(Object.groupBy(unionArray, ({ CRDN_ID }) => CRDN_ID)); + + var url = wctx.url("/sprt/sprt01/110/info.do"); + + var dialogId = "printCrdnDialog"; + + ajax.get({ + url : url + , data : { crdnIds : crdnIds.join(",") } + , success : resp => { + dialog.open({ + id : dialogId + , title : "종합조회-단속내역" + , size : "xl" + , content : resp + , init : () => { + + $("#"+dialogId).find("input[name='dialogId']").val(dialogId); + var found = $("#"+dialogId).find("template")[0].innerHTML; + var trs1 = upDataset.inStrings(found, null); + var trs2 = downDataset.inStrings(found, null); + $("#"+dialogId).find("tbody").html(trs1.join()+trs2.join()); + } + , onClose : () => { } + }); + } + }); + +} + //개별총정보 dialog integrationSearch.getInfo = (taskSeCd, crdnId) => { if (crdnId == undefined || crdnId == null || crdnId == "") { @@ -411,6 +456,8 @@ integrationSearch.setEvent = () => { $("#btnReset--${pageName}").on("click", function(){ integrationSearch.fnReset(); }); $("#btnSearch--${pageName}").on("click", function(){ integrationSearch.fnSearchList(); }); + $("#btnPrintCrdn--${pageName}").on("click", function(){ integrationSearch.fnPrintCrdn(); }); + $("#btnUpExcel--${pageName}").on("click", function(){ integrationSearch.fnExcel("up"); }); $("#btnDownExcel--${pageName}").on("click", function(){ integrationSearch.fnExcel("down"); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp index 0501f659..1dc674f1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01011-info.jsp @@ -15,8 +15,8 @@ title="압류 조서/해제조서" onclick=""> 압류 조서/헤제조서 - - diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01013-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01013-info.jsp index 0504c57c..4822d2b5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01013-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01013-info.jsp @@ -57,7 +57,7 @@ title="결손취소-일괄"> 결손취소-일괄 - diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01100-info.jsp similarity index 97% rename from src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01030-info.jsp rename to src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01100-info.jsp index abdea5af..4fb9a001 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01100-info.jsp @@ -79,7 +79,7 @@ $(document).ready(function(){ } ajax.get({ - url : wctx.url("/sprt/sprt01/030/update.do"), + url : wctx.url("/sprt/sprt01/100/update.do"), data : { crdnIds : $P.crdnIds.join(","), etcCn : etcCn diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp new file mode 100644 index 00000000..a3c9955b --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp @@ -0,0 +1,91 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> + +출력대상-단속내역서/단속확인서 + +
+
+
+
+
+ + + + +
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
시군구명과태료명대체차량번호차량번호단속구분단속일시단속장소고지번호수납일자처리상태수납금액잔액성명주소번지
+
+
+
+ +
+ +
+
+
+ + \ No newline at end of file