From bf4315f00d6dcce0199e6f3264fb675bb5acaea6 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 7 Jul 2023 09:32:47 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=EC=A0=95=EB=A6=AC(=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=20=EC=B6=94=EA=B0=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/crdn/web/Crdn05Controller.java | 33 +++- .../cokr/xit/fims/task/DpvController.java | 17 +- .../WEB-INF/jsp/fims/crdn/crdn01010-main.jsp | 19 ++- .../WEB-INF/jsp/fims/crdn/crdn01030-main.jsp | 18 ++- .../WEB-INF/jsp/fims/crdn/crdn05010-main.jsp | 149 +++++++++++++++--- .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp | 133 +++++++++++----- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 40 +++-- .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp | 103 ++++++------ .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp | 33 ++-- .../WEB-INF/jsp/fims/crdn/crdn06040-main.jsp | 35 ++-- 10 files changed, 414 insertions(+), 166 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index 58994c43..dd9412ed 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -4,12 +4,14 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.service.Crdn05Service; /**단속 자료 등록 서비스 웹 컨트롤러.
@@ -48,16 +50,45 @@ public class Crdn05Controller extends ApplicationController { * @return fims/crdn/crdn05030-info */ @RequestMapping(name="단속자료 수기 등록 화면", value="/030/info.do") - public ModelAndView getManualRegistrationScreen() { + public ModelAndView getManualRegistrationScreen(HttpServletRequest request) { ModelAndView mav = new ModelAndView("fims/crdn/crdn05030-info"); + mav.addObject("pageName", "crdn05030-info"); + String urlTaskSeCd = request.getServletPath().split("/")[1]; + mav.addObject("taskSeCd", urlTaskSeCd); Map> commonCodes = getCodesOf("FIM011","FIM034","FIM053","LVS005"); mav.addObject("FIM011List", commonCodes.get("FIM011")); mav.addObject("FIM034List", commonCodes.get("FIM034")); mav.addObject("FIM053List", commonCodes.get("FIM053")); mav.addObject("LVS005List", commonCodes.get("LVS005")); + + switch(urlTaskSeCd) { + case "PVS" -> {} + case "BPV" -> {} + case "DPV" -> { + commonCodes = getCodesOf("FIM006"); + mav.addObject("FIM006List", commonCodes.get("FIM006")); + } + case "ECA" -> {} + } + return mav; } + /**단속 대장을 수기 등록한다. + * @param Crdn 단속 대장 정보 + * @return jsonView + * 
 {
+	 *     "saved": 등록되었으면 true, 그렇지 않으면 false
+	 * }
+ */ + @RequestMapping(name="단속자료 수기 등록", value="/030/create.do") + public ModelAndView createCrdnDataByManual(Crdn crdn) { + + boolean saved = false; + + return new ModelAndView("jsonView") + .addObject("saved", saved); + } } diff --git a/src/main/java/cokr/xit/fims/task/DpvController.java b/src/main/java/cokr/xit/fims/task/DpvController.java index f9fe5341..306c777f 100644 --- a/src/main/java/cokr/xit/fims/task/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/DpvController.java @@ -1,16 +1,10 @@ package cokr.xit.fims.task; -import java.util.List; -import java.util.Map; - import javax.annotation.Resource; - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; - -import cokr.xit.base.code.CommonCode; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.service.Crdn06Service; @@ -33,16 +27,7 @@ public class DpvController { @Controller @RequestMapping(name="장애인과태료업무 단속등록업무", value="/DPV/crdn/crdn05") - class DpvCrdn05Controller extends Crdn05Controller { - - public ModelAndView getManualRegistrationScreen() { - ModelAndView mav = super.getManualRegistrationScreen(); - Map> commonCodes = getCodesOf("FIM006"); - mav.addObject("FIM006List", commonCodes.get("FIM006")); - return mav; - } - - } + class DpvCrdn05Controller extends Crdn05Controller {} @Controller @RequestMapping(name="장애인과태료업무 단속업무", value="/DPV/crdn/crdn06") diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp index 4fb17a06..c18b332a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp @@ -139,6 +139,9 @@ $(document).ready(function(){ var $P = pageObject["${pageName}"]; + /************************************************************************** + * DatasetControl + **************************************************************************/ $P.crdnControl = new DatasetControl({ prefix:"crdn", prefixName:"종합", infoSize:"xl", urls : { load : "", getInfo : "" }, keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true, @@ -150,6 +153,9 @@ $(document).ready(function(){ } }); + /************************************************************************** + * DatasetControl.on + **************************************************************************/ $P.crdnControl.onDatasetChange = obj => { $P.renderCrdnList(); @@ -169,10 +175,13 @@ $(document).ready(function(){ $P.crdnControl.onCurrentChange = item => { if (!item) return; - let key = item.data.CRDN_ID; + var key = item.data.CRDN_ID; $("#crdnTbody--${pageName}").setCurrentRow(key); } + /************************************************************************** + * pageObject.function + **************************************************************************/ $P.fnReset = () => { $('#schCvlcptRcptYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); $('#schCvlcptRcptYmdTo--${pageName}').datepicker('setDate', new Date()); @@ -227,10 +236,11 @@ $(document).ready(function(){ return data; } - //이벤트 추가 + /************************************************************************** + * element.on + **************************************************************************/ $('#btnReset--${pageName}').on('click', () => $P.fnReset()); $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList()); - $("#table-responsive--${pageName}").scroll(function(){ var el = $(this); if(el.scrollTop() == 0){ @@ -242,6 +252,9 @@ $(document).ready(function(){ } }); + /************************************************************************** + * 초기화 + **************************************************************************/ //달력 초기화 initDatepicker("frmSearch--${pageName}"); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp index 9fdb5da5..a7820f0a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp @@ -144,6 +144,9 @@ $(document).ready(function(){ var $P = pageObject["${pageName}"]; + /************************************************************************** + * DatasetControl + **************************************************************************/ $P.crdnControl = new DatasetControl({ prefix:"crdn", prefixName:"종합", infoSize:"xl", urls : { load : "", getInfo : "" }, keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true, @@ -156,6 +159,9 @@ $(document).ready(function(){ } }); + /************************************************************************** + * DatasetControl.on + **************************************************************************/ $P.crdnControl.onDatasetChange = obj => { $P.renderCrdnList(); @@ -175,10 +181,13 @@ $(document).ready(function(){ $P.crdnControl.onCurrentChange = item => { if (!item) return; - let key = item.data.CRDN_ID; + var key = item.data.CRDN_ID; $("#crdnTbody--${pageName}").setCurrentRow(key); } + /************************************************************************** + * pageObject.function + **************************************************************************/ $P.fnReset = () => { $('#schCvlcptRcptYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); $('#schCvlcptRcptYmdTo--${pageName}').datepicker('setDate', new Date()); @@ -233,7 +242,9 @@ $(document).ready(function(){ return data; } - //이벤트 추가 + /************************************************************************** + * element.on + **************************************************************************/ $('#btnReset--${pageName}').on('click', () => $P.fnReset()); $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList()); @@ -248,6 +259,9 @@ $(document).ready(function(){ } }); + /************************************************************************** + * 초기화 + **************************************************************************/ //달력 초기화 initDatepicker("frmSearch--${pageName}"); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp index 08d42da5..02b33ec3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp @@ -9,7 +9,7 @@
- +
@@ -40,6 +40,9 @@
+ +
    +
단속 파일 등록 @@ -47,6 +50,34 @@
+
+
+
+ + + + + + + + + + +
No.temp
+
+
+
@@ -57,7 +88,9 @@
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index 33bb4d53..a403dde8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -3,10 +3,10 @@
- +
-
-
-
-
- - + +
- - + +
- - + +
- -
- - @@ -73,57 +74,57 @@
- - + +
- - + +
- -
- +
- - + +
- - + +
- - + +
- - + +
차량명칭/차량색상은 입력항목이 아닙니다.
- - + +
- - + +
- - @@ -131,8 +132,8 @@
-
@@ -140,7 +141,7 @@
- +
@@ -153,14 +154,62 @@