From dbd7071242d5882a455f9be95be5e325fa64ae34 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 10 Aug 2023 13:53:41 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=A2=85=EB=A3=8C=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EC=BB=AC=EB=9F=BC=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/crdn/Crdn.java | 2 +- .../excl/service/bean/Excl03ServiceBean.java | 2 +- .../sql/mapper/fims/crdn/crdn01-mapper.xml | 2 +- .../sql/mapper/fims/crdn/crdn05-mapper.xml | 6 +- .../sql/mapper/fims/crdn/crdn06-mapper.xml | 4 +- .../sql/mapper/fims/excl/excl03-mapper.xml | 2 +- .../WEB-INF/jsp/fims/crdn/crdn01020-info.jsp | 72 +++++++++++++++++-- .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp | 6 +- 8 files changed, 78 insertions(+), 18 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java index 6dd749f6..68a9d298 100644 --- a/src/main/java/cokr/xit/fims/crdn/Crdn.java +++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java @@ -145,7 +145,7 @@ public class Crdn extends AbstractEntity { /** * 단속 종료 시간 */ - private String crdnEndHr; + private String crdnEndTm; /** * 단속 일련번호 diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java index 25754bc0..1ae00125 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java @@ -74,7 +74,7 @@ public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Serv crdn.setVltnCd(infoCrdn.string("VLTN_CD")); // 위반 코드 crdn.setCrdnSpareaCd(infoCrdn.string("CRDN_SPAREA_CD")); // 단속 특별구역 코드 crdn.setCrdnBgngTm(infoCrdn.string("CRDN_BGNG_TM")); // 단속 시작 시각 - crdn.setCrdnEndHr(infoCrdn.string("CRDN_END_HR")); // 단속 종료 시각 + crdn.setCrdnEndTm(infoCrdn.string("CRDN_END_TM")); // 단속 종료 시각 crdn.setCrdnSn(infoCrdn.string("CRDN_SN")); // 단속 일련번호 crdn.setGpsX(infoCrdn.string("GPS_X")); // GPS X crdn.setGpsY(infoCrdn.string("GPS_Y")); // GPS Y diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index bdfac5a7..c279851c 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -52,7 +52,7 @@ SELECT C.CRDN_ID , CA.TEAM_ID , CA.CRDN_SPAREA_CD , CA.CRDN_BGNG_TM - , CA.CRDN_END_HR + , CA.CRDN_END_TM , CA.CRDN_SN , CA.MOSC_X , CA.MOSC_Y diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml index bd055602..6161159a 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml @@ -138,13 +138,13 @@ INSERT INTO TB_CRDN ( /* 단속 부가 정보 등록(crdn05Mapper.insertCrdnAddition) */ -INSERT INTO TB_CRDN ( +INSERT INTO TB_CRDN_ADI ( CRDN_ID , CRDN_SE_CD , DTL_CRDN_PLC , CRDN_SPAREA_CD , CRDN_BGNG_TM - , CRDN_END_HR + , CRDN_END_TM , CRDN_SN , MOSC_X , MOSC_Y @@ -169,7 +169,7 @@ INSERT INTO TB_CRDN ( , #{dtlCrdnPlc} , #{crdnSpareaCd} , #{crdnBgngTm} - , #{crdnEndHr} + , #{crdnEndTm} , #{crdnSn} , #{moscX} , #{moscY} diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index 6e9d4223..7b07a5f8 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -22,7 +22,7 @@ - + @@ -131,7 +131,7 @@ SELECT C.CRDN_ID , CA.TEAM_ID , CA.CRDN_SPAREA_CD , CA.CRDN_BGNG_TM - , CA.CRDN_END_HR + , CA.CRDN_END_TM , CA.CRDN_SN , CA.MOSC_X , CA.MOSC_Y diff --git a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml index 7125eda3..0373fbe8 100644 --- a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml @@ -200,7 +200,7 @@ , (SELECT VLTN_CD FROM TB_VLTN_INFO X WHERE X.VLTN_ID = A.VLTN_ID AND X.SGG_CD = A.SGG_CD AND X.TASK_SE_CD = A.TASK_SE_CD) AS VLTN_CD , A.CRDN_SPAREA_CD , A.CRDN_BGNG_TM - , A.CRDN_END_HR + , A.CRDN_END_TM , A.CRDN_SN , A.GPS_X , A.GPS_Y diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp index cdc94447..c722dba7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp @@ -84,7 +84,7 @@
+ class="form-control" readonly />
@@ -253,9 +253,20 @@
-
+
+ + + +
+
-
+
+ + + + + +
@@ -323,7 +334,11 @@ $(document).ready(function(){ $P.uploadSet = uploadSupport("#inputUploadSet--${pageName}"); $P.crdnControl = new DatasetControl({ - urls : { load : "", update : wctx.url("/${taskSeCd}/crdn/crdn01/020/save.do") }, + urls : { + load : "", + getInfo : wctx.url("/${taskSeCd}/crdn/crdn01/020/info.do"), + update : wctx.url("/${taskSeCd}/crdn/crdn01/020/save.do") + }, keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnInfo, formats: { @@ -533,10 +548,57 @@ $(document).ready(function(){ $P.fnDisplay(true); } } + + $P.openLevyExclPop = (levyExclSeCd) => { + var crdnId = $("#crdnId--${pageName}").val(); + + var params = { + "crdnId" : crdnId, + "levyExclSeCd" : levyExclSeCd + }; + + ajax.get({ + url : wctx.url("/excl/excl01/020/info.do"), + data : params, + success : resp => { + + dialog.open({ + id : "levyExcldialog--${pageName}", + title : "부과제외 정보", + content : resp, + size : "lg", + init : () => { }, + onClose : () => { $P.fnGo(crdnId); } // callback + }); + } + }); + }; + + $P.fnGo = (crdnId) => { + ajax.get({ + url: $P.crdnControl.urls.getInfo, + data: { "crdnId" : crdnId }, + headers: { + Accept: "application/json; charset=utf-8" + }, + success : resp => { + var crdnInfo = resp.crdnInfo; + crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN); + $P.crdnControl.setData([crdnInfo]); + + //var cs = $P.provided.getCountStatus($("#crdnId--${pageName}").val()); + //$("#countStauts--${pageName}").val(cs); + //$P.provided.selectRow(crdnId); + } + }); + } + /************************************************************************** * element.on **************************************************************************/ - + $("#btnInstLevyExcl1--${pageName}").on("click", () => $P.openLevyExclPop("1")); + $("#btnInstLevyExcl2--${pageName}").on("click", () => $P.openLevyExclPop("2")); + $("#btnInst--${pageName}").on('click', () => $P.fnSave()); $("#btnAddFile--${pageName}").on('click', () => { $("#inputUploadSet--${pageName}").trigger("click"); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index 996611ca..50fac226 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -582,7 +582,7 @@ $(document).ready(function(){ } } - $P.openLevyExclPop = (levyExclSeCd, levyExclPrefix, levyExclPrefixName) => { + $P.openLevyExclPop = (levyExclSeCd) => { var info = ""; if ($P.currentDisplay == "photoInspection") { @@ -606,8 +606,6 @@ $(document).ready(function(){ url : wctx.url("/excl/excl01/020/info.do"), data : params || {}, success : resp => { - resp = resp.replace(/infoPrefix/g, levyExclPrefix) - .replace(/prefixName/g, levyExclPrefixName); dialog.open({ id : "levyExcldialog--${pageName}", @@ -707,7 +705,7 @@ $(document).ready(function(){ }); $('#btnSearch--${pageName}').on('click', () => $P.searchInspectionList()); //검색버튼 - $("#btnInstLevyExcl--${pageName}").on("click", () => $P.openLevyExclPop("1", "levyExcl", "비부과")); + $("#btnInstLevyExcl--${pageName}").on("click", () => $P.openLevyExclPop("1")); //스크롤 이벤트 추가(동일차량검사) $("#photoInspection-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });