diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index 82acc23f..d8c20fbb 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -83,6 +83,7 @@ public class Cvlc02Controller extends ApplicationController { query.setCurrentInstitute(currentUser().getInstitute()); query.setCurrentUserAcnt(currentUser().getAccount()); DataObject cvlcptInfo = crdnCvlcptService.getAnswerPreview(query); + mav.addObject("openerPageName", hReq.getParameter("openerPageName")); mav.addObject("cvlcptInfo", json ? cvlcptInfo : toJson(cvlcptInfo)); return mav; diff --git a/src/main/java/cokr/xit/fims/excl/ExclQuery.java b/src/main/java/cokr/xit/fims/excl/ExclQuery.java index bbe4c3e5..77e5fcab 100644 --- a/src/main/java/cokr/xit/fims/excl/ExclQuery.java +++ b/src/main/java/cokr/xit/fims/excl/ExclQuery.java @@ -49,6 +49,7 @@ public class ExclQuery extends CmmnQuery { private String callPurpose; // 호출용도 필요시 사용(view, select, create, update) private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 + private String crdnDelYn; // 단속 삭제 여부 private String ansRsnCd; // 민원 답변 문구(TB_CVLCPT_ANS_WORDS) - 답변 사유 코드 private String sndngRcvmtCd; // 발송 수납 코드 @@ -345,6 +346,16 @@ public class ExclQuery extends CmmnQuery { return self(); } + public String getCrdnDelYn() { + return ifEmpty(crdnDelYn, () -> null); + } + + public T setCrdnDelYn(String crdnDelYn) { + this.crdnDelYn = crdnDelYn; + + return self(); + } + public String getAnsRsnCd() { return ifEmpty(ansRsnCd, () -> null); } diff --git a/src/main/java/cokr/xit/fims/levy/LevyQuery.java b/src/main/java/cokr/xit/fims/levy/LevyQuery.java index 1f8cf11f..74cad63d 100644 --- a/src/main/java/cokr/xit/fims/levy/LevyQuery.java +++ b/src/main/java/cokr/xit/fims/levy/LevyQuery.java @@ -32,6 +32,7 @@ public class LevyQuery extends CmmnQuery { private String callPurpose; // 호출용도 필요시 사용(select, create, update) private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 + private String crdnDelYn; // 단속 삭제 여부 public String getCrdnId() { return ifEmpty(crdnId, () -> null); @@ -158,6 +159,16 @@ public class LevyQuery extends CmmnQuery { return self(); } + + public String getCrdnDelYn() { + return ifEmpty(crdnDelYn, () -> null); + } + + public T setCrdnDelYn(String crdnDelYn) { + this.crdnDelYn = crdnDelYn; + + return self(); + } // ETC ///////////////////////////////////////////////////////////////////// } 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 cb69dd53..8aba7b29 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -79,15 +79,22 @@ AND C.VHRNO = #{schVhrno} /* 차량번호 */ + + + AND CRR.DEL_YN = #{delYn} /* 삭제 여부 */ + + + AND CRR.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} /* 삭제 여부 */ + + AND C.DEL_YN = #{crdnDelYn} /* 삭제 여부 */ @@ -125,12 +132,17 @@ AND CRR.RE_REG_ID = #{reRegId} /* 재등록 ID */ + + + AND CRR.DEL_YN = #{delYn} /* 삭제 여부 */ + + + AND CRR.DEL_YN = 'N' /* 삭제 여부 */ + + AND C.CRDN_ID = #{crdnId} /* 단속 ID */ - - AND CRR.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 ddcced33..782dfd35 100644 --- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml @@ -158,14 +158,21 @@ - + + + AND LE.DEL_YN = #{delYn} /* 삭제 여부 */ + + AND LE.DEL_YN = 'N' /* 삭제 여부 */ + + + AND C.SGG_CD = #{sggCd} /* 시군구 코드 */ AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */ - - AND C.DEL_YN = #{delYn} /* 삭제 여부 */ + + AND C.DEL_YN = #{crdnDelYn} /* 삭제 여부 */ @@ -208,12 +215,17 @@ AND LE.LEVY_EXCL_ID = #{levyExclId} /* 부과 제외 ID */ + + + AND LE.DEL_YN = #{delYn} /* 삭제 여부 */ + + + AND LE.DEL_YN = 'N' /* 삭제 여부 */ + + AND C.CRDN_ID = #{crdnId} /* 단속 ID */ - - AND LE.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 a03766c3..deda9e03 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -195,14 +195,21 @@ - + + + AND OS.DEL_YN = #{delYn} /* 삭제 여부 */ + + AND OS.DEL_YN = 'N' /* 삭제 여부 */ + + + AND C.SGG_CD = #{sggCd} /* 시군구 코드 */ AND C.TASK_SE_CD = #{taskSeCd} /* 업무 구분 코드 */ - - AND C.DEL_YN = #{delYn} /* 삭제 여부 */ + + AND C.DEL_YN = #{crdnDelYn} /* 삭제 여부 */ @@ -249,12 +256,17 @@ AND OS.OPNN_ID = #{opnnId} /* 의견제출 ID */ + + + AND OS.DEL_YN = #{delYn} /* 삭제 여부 */ + + + AND OS.DEL_YN = 'N' /* 삭제 여부 */ + + AND C.CRDN_ID = #{crdnId} /* 단속 ID */ - - AND OS.DEL_YN = #{delYn} /* 삭제 여부 */ - diff --git a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml index 18032054..59126b7a 100644 --- a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml @@ -71,27 +71,37 @@ diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp index b6966d07..ca67a0c4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp @@ -7,7 +7,7 @@
- +
- +
- +
변경할내용이있으면 수정하시오.
@@ -63,35 +63,35 @@ pageObject.childReq.push({ }); $(document).ready(function() { - + var $P = pageObject["${pageName}"]; $P.taskSeCd = "${taskSeCd}"; - + if(pageObject.parentRes.length > 0){ $P.parentRes = pageObject.parentRes.pop(); } else { $P.parentRes = pageObject.childReq.pop(); } - + /************************************************************************** * DatasetControl, Dataset, FormFields **************************************************************************/ $P.formFields = new FimsFormFields("#frmEdit--${pageName}"); $P.cvlcptControl = new DatasetControl({ - urls : { - load : "", + urls : { + load : "", getInfo : wctx.url("/"+$P.taskSeCd+"/cvlc/cvlc01/060/info.do"), update : wctx.url("/"+$P.taskSeCd+"/cvlc/cvlc01/060/update.do") - }, + }, keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.cvlcptInfo, - formats: { + formats: { CVLCPT_RCPT_YMD : dateFormat, CVLCPT_PRCS_PRNMNT_DT : dateFormat } }); - + $P.cvlcptControl.save = (info) => { if (!info) return; @@ -100,77 +100,77 @@ $(document).ready(function() { data : info, success : resp => { $P.cvlcptControl.onSave(resp); } }); - + }; - + /************************************************************************** * DatasetControl.on, Dataset.on **************************************************************************/ $P.cvlcptControl.onCurrentChange = (item) => { $P.formFields.set(item); } - + $P.cvlcptControl.onSave = (resp) => { if (resp.saved) { dialog.alert("저장됐습니다."); } } - + /************************************************************************** * pageObject.function **************************************************************************/ - + $P.fnPrev = () => { var prevKey = $P.parentRes.getPrevKey($("#crdnId--${pageName}").val()); if(prevKey != ""){ $P.fnGo(prevKey); } } - + $P.fnNext = () => { var nextKey = $P.parentRes.getNextKey($("#crdnId--${pageName}").val()); if(nextKey != ""){ $P.fnGo(nextKey); } } - + $P.fnGo = (crdnId) => { ajax.get({ url: $P.cvlcptControl.urls.getInfo, data: { "crdnId" : crdnId }, - headers: { + headers: { Accept: "application/json; charset=utf-8" }, success : resp => { var cvlcptInfo = resp.cvlcptInfo; cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); $P.cvlcptControl.setData([cvlcptInfo]); - + var cs = $P.parentRes.getCountStatus($("#crdnId--${pageName}").val()); $("#countStauts--${pageName}").val(cs); $P.parentRes.selectRow(crdnId); } }); } - + $P.fnSave = () => { - + if(!customValidate($("#frmEdit--${pageName} input"))) return; - + if(confirm("현재 답변 내용을 저장하시겠습니까?")){ $P.cvlcptControl.save($P.formFields.get()); } - + } - + /************************************************************************** * element.on **************************************************************************/ $("#btnPrev--${pageName}").on("click", () => $P.fnPrev() ); $("#btnNext--${pageName}").on("click", () => $P.fnNext() ); - + $("#btnSave--${pageName}").on("click", () => $P.fnSave() ); - + /************************************************************************** * 초기화 **************************************************************************/ @@ -180,9 +180,13 @@ $(document).ready(function() { var cs = $P.parentRes.getCountStatus($("#crdnId--${pageName}").val()); $("#countStauts--${pageName}").val(cs); -}); - - + let openerPageName = "${openerPageName}"; + if (openerPageName == "sprt02020") { + $("#btnSave--${pageName}").hide(); + } else { + $("#btnSave--${pageName}").show(); + } +}); \ No newline at end of file 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 d877ac07..c616e0af 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 @@ -530,6 +530,7 @@ // 검색조건 ${pageName}Control.query = fnGetParams${pageName}(); ${pageName}Control.query.delYn = "N"; // 삭제 여부 + ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 ${pageName}Control.load(); } 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 e2e654ee..e503c839 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 @@ -549,6 +549,7 @@ // 검색조건 ${pageName}Control.query = fnGetParams${pageName}(); ${pageName}Control.query.delYn = "N"; // 삭제 여부 + ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 ${pageName}Control.load(); } 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 da9bae85..da1000ee 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 @@ -424,6 +424,7 @@ // 검색조건 ${pageName}Control.query = fnGetParams${pageName}(); ${pageName}Control.query.delYn = "N"; // 삭제 여부 + ${pageName}Control.query.crdnDelYn = "N"; // 단속 대장 삭제 여부 ${pageName}Control.load(); } 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 76f5b13d..b72e1a15 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 @@ -311,7 +311,6 @@ , crdnId : crdnId , sggCd : sggCd , taskSeCd : taskSeCd - , delYn : "N" }; ajax.get({ @@ -339,7 +338,6 @@ , crdnId : crdnId , sggCd : sggCd , taskSeCd : taskSeCd - , delYn : "N" }; ajax.get({ @@ -363,7 +361,6 @@ let params = { callPurpose : "view" , crdnId : crdnId - , delYn : "N" }; ajax.get({ @@ -387,7 +384,6 @@ let params = { callPurpose : "view" , crdnId : crdnId - , delYn : "N" }; ajax.get({ @@ -411,7 +407,6 @@ let params = { callPurpose : "view" , crdnId : crdnId - , delYn : "N" }; ajax.get({ @@ -435,7 +430,6 @@ let params = { callPurpose : "view" , crdnId : crdnId - , delYn : "N" }; ajax.get({ @@ -462,7 +456,6 @@ , inquiryCondition : "crdnId_vhrno" , crdnId : crdnId , vhrno : vhrno - , delYn : "N" }; ajax.get({ 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 0950694e..06e2e932 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 @@ -602,7 +602,7 @@ let dialogId = "answerPreviewDialog--${pageName}"; ajax.get({ - url : wctx.url("/" + params.taskSeCd + "/cvlc/cvlc02/060/info.do") + url : wctx.url("/" + params.taskSeCd + "/cvlc/cvlc02/060/info.do?openerPageName=${pageName}") , data : params || {} , success : resp => { dialog.open({