From f2cd5e3945697b0493eeeb452408b04aa9502471 Mon Sep 17 00:00:00 2001 From: jjh Date: Fri, 15 Sep 2023 16:59:53 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B3=84=EC=B4=9D=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20-=20=EC=9E=90=EB=A3=8C=20=EC=82=AD=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/mapper/fims/excl/crdnReReg-mapper.xml | 10 +-- .../sql/mapper/fims/excl/levyExcl-mapper.xml | 8 +-- .../sql/mapper/fims/excl/opnnSbmsn-mapper.xml | 8 +-- .../mapper/fims/sprt/cvlcptDscsnCn-mapper.xml | 3 + .../sql/mapper/fims/sprt/totalInfo-mapper.xml | 4 +- .../WEB-INF/jsp/fims/sprt/sprt02010-main.jsp | 66 +++++++++++++------ .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 2 +- 7 files changed, 64 insertions(+), 37 deletions(-) diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml index 3ef2a144..cb69dd53 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -79,16 +79,16 @@ AND C.VHRNO = #{schVhrno} /* 차량번호 */ - - AND CRR.DEL_YN = #{delYn} /* 삭제 여부 */ - - AND C.SGG_CD = #{sggCd} /* 시군구 코드 */ - AND C.DEL_YN = 'N' /* 삭제 여부 */ AND CRR.CRDN_REG_SE_CD = '03' /* 단속 등록 구분 코드 - FIM026 */ + AND CRR.DEL_YN = 'N' /* 삭제 여부 */ + AND C.SGG_CD = #{sggCd} /* 시군구 코드 */ AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */ + + AND C.DEL_YN = #{delYn} /* 삭제 여부 */ + diff --git a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml index 42d54ce9..ddcced33 100644 --- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml @@ -158,15 +158,15 @@ - - AND LE.DEL_YN = #{delYn} /* 삭제 여부 */ - + AND LE.DEL_YN = 'N' /* 삭제 여부 */ AND C.SGG_CD = #{sggCd} /* 시군구 코드 */ - AND C.DEL_YN = #{delYn} /* 삭제 여부 */ AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */ + + AND C.DEL_YN = #{delYn} /* 삭제 여부 */ + 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 429e1391..a03766c3 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -195,15 +195,15 @@ - - AND OS.DEL_YN = #{delYn} /* 삭제 여부 */ - + AND OS.DEL_YN = 'N' /* 삭제 여부 */ AND C.SGG_CD = #{sggCd} /* 시군구 코드 */ - AND C.DEL_YN = #{delYn} /* 삭제 여부 */ AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */ + + AND C.DEL_YN = #{delYn} /* 삭제 여부 */ + diff --git a/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsnCn-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsnCn-mapper.xml index 2f5d94ac..60b81403 100644 --- a/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsnCn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsnCn-mapper.xml @@ -183,6 +183,9 @@ FROM TB_CRDN C LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) WHERE C.CRDN_ID = #{crdnId} /* 단속 ID */ + + AND C.DEL_YN = #{delYn} /* 삭제 여부 */ + diff --git a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml index 9b32c37a..82e5f869 100644 --- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml @@ -13,6 +13,7 @@ , C.TASK_SE_CD /* 업무 구분 코드 */ , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM /* 단속 일시 */ , C.VHRNO /* 차량번호 */ + , C.CRDN_STTS_CD /* 단속 상태 코드 */ , (SELECT FN_GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM /* 단속 상태 명 */ , C.CRDN_STTS_CHG_DT /* 단속 상태 변경 일시 */ , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO /* 고지번호 */ @@ -165,9 +166,6 @@ /* 단속 첨부 파일갯수 수정 (sprt02Mapper.updateCrdnAtchFileCnt) */ diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp index 587d082c..76f5b13d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp @@ -109,7 +109,7 @@ // FormFields var ${pageName}Fields = new FormFields("#frmEdit--${pageName}"); // 자료 이동을 위한 자료의 Index. 0부터 시작. - var curDataIndex; + var curDataIndex${pageName}; /************************************************************************** * DatasetControl @@ -131,6 +131,9 @@ // 건수 표기 fnChangeCountStauts${pageName}(); + + // 자료 수정 + useDataEdit${pageName}(item); } /************************************************************************** @@ -154,12 +157,35 @@ }); } + // 자료 삭제 가능 여부 + useDataEdit${pageName} = (item) => { + // 삭제 자료일 경우 빨간색으로 변경 + let elem = document.getElementById("crdnSttsNm--${pageName}"); + + if (item.data.CRDN_STTS_CD == "99") { + elem.classList.remove("text-primary"); + elem.classList.add("text-danger"); + } else { + elem.classList.remove("text-danger"); + elem.classList.add("text-primary"); + } + } + + // + fnClose${pageName} = (isDataReLoad) => { + dialog.close(${pageName}Control.prefix + "Dialog"); + + if (isDataReLoad) { + ${callControlName}._load(); + } + } + /************************************************************************** * 초기 셋팅 **************************************************************************/ // 화면 초기값 셋팅 initForm${pageName} = () => { - curDataIndex = null; // 화면이 열릴때 초기 값으로 null로 설정해야 건수가 정상 표시 된다. + curDataIndex${pageName} = null; // 화면이 열릴때 초기 값으로 null로 설정해야 건수가 정상 표시 된다. } // 이벤트 설정 @@ -172,20 +198,20 @@ **************************************************************************/ // 건수 표기 fnChangeCountStauts${pageName} = () => { - // curDataIndex 에 값이 없다면.. - if (curDataIndex == null) { + // curDataIndex${pageName} 에 값이 없다면.. + if (curDataIndex${pageName} == null) { let mainDataItems = ${callControlName}.dataset._items; let curCrdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); for (iLoop = 0; iLoop < mainDataItems.length; iLoop++) { if (mainDataItems[iLoop].data.CRDN_ID == curCrdnId) { - curDataIndex = iLoop; + curDataIndex${pageName} = iLoop; break; } } } - let viewNumber = curDataIndex + 1; + let viewNumber = curDataIndex${pageName} + 1; $("#countStauts--${pageName}").val(viewNumber + " of " + ${callControlName}.dataset._items.length); } @@ -196,20 +222,20 @@ let curCrdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); // 초기 값은 callControl dataset 의 총 건수 - 1 - if (curDataIndex == null) { - curDataIndex = mainDataItems.length - 1; + if (curDataIndex${pageName} == null) { + curDataIndex${pageName} = mainDataItems.length - 1; } - for (iLoop = curDataIndex; iLoop >= 0; iLoop--) { + for (iLoop = curDataIndex${pageName}; iLoop >= 0; iLoop--) { if (mainDataItems[iLoop].data.CRDN_ID == curCrdnId) { if (iLoop - 1 < 0) { return; } // 종료 - curDataIndex = iLoop - 1; + curDataIndex${pageName} = iLoop - 1; break; } } - let crdnId = mainDataItems[curDataIndex].data.CRDN_ID; + let crdnId = mainDataItems[curDataIndex${pageName}].data.CRDN_ID; // 단속 ID 가 없다면.. return if (crdnId == null || crdnId == "") { @@ -220,8 +246,8 @@ callPurpose : "view" , callControlName : "${callControlName}" , crdnId : crdnId - , sggCd : mainDataItems[curDataIndex].data.SGG_CD - , taskSeCd : mainDataItems[curDataIndex].data.TASK_SE_CD + , sggCd : mainDataItems[curDataIndex${pageName}].data.SGG_CD + , taskSeCd : mainDataItems[curDataIndex${pageName}].data.TASK_SE_CD , delYn : "N" }; @@ -234,20 +260,20 @@ let curCrdnId = ${pageName}Control.dataset.getValue("CRDN_ID"); // 초기 값은 0 - if (curDataIndex == null) { - curDataIndex = 0; + if (curDataIndex${pageName} == null) { + curDataIndex${pageName} = 0; } - for (iLoop = curDataIndex; iLoop < mainDataItems.length; iLoop++) { + for (iLoop = curDataIndex${pageName}; iLoop < mainDataItems.length; iLoop++) { if (mainDataItems[iLoop].data.CRDN_ID == curCrdnId) { if (iLoop + 1 >= mainDataItems.length) { return; } // 종료 - curDataIndex = iLoop + 1; + curDataIndex${pageName} = iLoop + 1; break; } } - let crdnId = mainDataItems[curDataIndex].data.CRDN_ID; + let crdnId = mainDataItems[curDataIndex${pageName}].data.CRDN_ID; // 단속 ID 가 없다면.. return if (crdnId == null || crdnId == "") { @@ -258,8 +284,8 @@ callPurpose : "view" , callControlName : "${callControlName}" , crdnId : crdnId - , sggCd : mainDataItems[curDataIndex].data.SGG_CD - , taskSeCd : mainDataItems[curDataIndex].data.TASK_SE_CD + , sggCd : mainDataItems[curDataIndex${pageName}].data.SGG_CD + , taskSeCd : mainDataItems[curDataIndex${pageName}].data.TASK_SE_CD , delYn : "N" }; diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp index 544232a1..0950694e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp @@ -382,7 +382,7 @@ dialog.alert(showMessage); if (resp.saved) { - dialog.close(${pageNameMain}Control.prefix + "Dialog"); + fnClose${pageNameMain}(true); } }