diff --git a/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java b/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java index 92b36d05..d5e50afc 100644 --- a/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/CvlcptDscsnQuery.java @@ -38,7 +38,8 @@ public class CvlcptDscsnQuery extends CmmnQuery { // 동적 검색 조건 private String inquiryCondition; - private String vhrno; + private String vhrno; // 차량번호 + private String rtpyrNo; // 납부자 번호 // ETC private String callPurpose; // 자료 조회시 호출용도. (view 조회, create 등록, update 수정, refresh 재조회) @@ -201,6 +202,16 @@ public class CvlcptDscsnQuery extends CmmnQuery { return self(); } + + public String getRtpyrNo() { + return ifEmpty(rtpyrNo, () -> null); + } + + public T setRtpyrNo(String rtpyrNo) { + this.rtpyrNo = rtpyrNo; + + return self(); + } // 동적 검색 조건 /////////////////////////////////////////////////////////////// // ETC ///////////////////////////////////////////////////////////////////// diff --git a/src/main/java/cokr/xit/fims/sprt/dao/CvlcptDscsnMapper.java b/src/main/java/cokr/xit/fims/sprt/dao/CvlcptDscsnMapper.java index 07e976d9..5c4b3b54 100644 --- a/src/main/java/cokr/xit/fims/sprt/dao/CvlcptDscsnMapper.java +++ b/src/main/java/cokr/xit/fims/sprt/dao/CvlcptDscsnMapper.java @@ -41,7 +41,7 @@ public interface CvlcptDscsnMapper extends AbstractMapper { */ default DataObject selectCvlcptDscsnInfo(CvlcptDscsnQuery req) { if (req.getOrderBy() == null) { - req.setOrderBy("CDC.CVLCPT_DSCSN_ID DESC"); + req.setOrderBy("CD.CVLCPT_DSCSN_ID DESC"); } List cvlcptDscsns = selectCvlcptDscsns(req); diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt04Bean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt04Bean.java index db5d4597..2b95cb5c 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt04Bean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt04Bean.java @@ -43,7 +43,7 @@ public class Sprt04Bean extends AbstractComponent { */ public List getCvlcptDscsns(CvlcptDscsnQuery req) { if (req.getOrderBy() == null) { - req.setOrderBy("CDC.REG_DT DESC, CDC.CVLCPT_DSCSN_ID DESC"); + req.setOrderBy("CD.REG_DT DESC, CD.CVLCPT_DSCSN_ID DESC"); } return cvlcptDscsnMapper.selectCvlcptDscsns(req); diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java index ae37b095..5fb375ea 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java @@ -100,7 +100,7 @@ public class Sprt04Controller extends ApplicationController { return mav .addObject("pageName", "sprt04020") // - .addObject("FIM065List", commonCodes.get("FIM065")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) + .addObject("FIM065List", commonCodes.get("FIM065")) // 민원 접수 구분 코드(CVLCPT_RCPT_SE_CD) .addObject("cvlcptDscsn", json ? cvlcptDscsn : toJson(cvlcptDscsn)) ; } diff --git a/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml index 3d77d061..78fd867e 100644 --- a/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/cvlcptDscsn-mapper.xml @@ -161,7 +161,7 @@ , NULL - , #{cvlcptDscsn.dscsnYmd} + , , ( CASE DAYOFWEEK(NOW()) WHEN '1' THEN '일' WHEN '2' THEN '월' @@ -184,7 +184,9 @@ /* 민원 상담 내용 수정(cvlcptDscsnMapper.updateCvlcptDscsn) */ UPDATE TB_CVLCPT_DSCSN - SET DSCSN_CN = #{cvlcptDscsn.dscsnCn} + SET CVLPR_NM = #{cvlcptDscsn.cvlprNm} + , CVLPR_CTTPC = #{cvlcptDscsn.cvlprCttpc} + , DSCSN_CN = #{cvlcptDscsn.dscsnCn} , MDFCN_DT = , MDFR = #{cvlcptDscsn.modifiedBy} WHERE CVLCPT_DSCSN_ID = #{cvlcptDscsn.cvlcptDscsnId} diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp index 2dbb7ed0..09e3e696 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04010-main.jsp @@ -61,6 +61,9 @@ + +
+
@@ -73,7 +76,7 @@
- +
@@ -291,9 +294,33 @@ $("#btnRemove--${pageName}").prop("disabled", keys.length < 1); }; - // 개별총정보 dialog - ${pageName}Control.getInfo = (crdnId) => { - // + // 민원상담 dialog + ${pageName}Control.getInfo = (cvlcptDscsnId) => { + if (typeof cvlcptDscsnId == "undefined" || cvlcptDscsnId == null || cvlcptDscsnId == "") { + return; + } + + let params = { + callPurpose : "update" + , sggCd : ${pageName}Control.dataset.getValue("SGG_CD") + , taskSeCd : ${pageName}Control.dataset.getValue("TASK_SE_CD") + , cvlcptDscsnId : cvlcptDscsnId + }; + + ajax.get({ + url : wctx.url(params.taskSeCd + ${pageName}PrefixUrl + "/020/info.do") + , data : params || {} + , success : resp => { + dialog.open({ + id : ${pageName}Control.prefixed("Dialog") + , title : ${pageName}Control.prefixName + " 수정" + , content : resp + , size : "lg" + , init : () => { } + , onClose : () => { ${pageName}Control.load(${pageName}Control.query.pageNum); } // callback 자료 재조회 + }); + } + }); } // 삭제 callback @@ -341,7 +368,7 @@ document.getElementById("${infoPrefix}Row--${pageName}").innerHTML, <%-- from template#${infoPrefix}Row --%> (str, dataItem) => str .replace(/{onclick}/gi, "${pageName}Control.setCurrent('" + dataItem.getValue("CVLCPT_DSCSN_ID") + "');") - .replace(/{ondblclick}/gi, "${pageName}Control.getInfo('" + dataItem.getValue("CRDN_ID") + "');") + .replace(/{ondblclick}/gi, "${pageName}Control.getInfo('" + dataItem.getValue("CVLCPT_DSCSN_ID") + "');") ); $("#tbody--${pageName}").html(trs.join()); @@ -471,7 +498,7 @@ // 수정 버튼 이벤트 fnUpdate${pageName} = () => { - + ${pageName}Control.getInfo(${pageName}Control.dataset.getValue("CVLCPT_DSCSN_ID")); } // 삭제 버튼 이벤트 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04020-info.jsp index 9e492ba5..d7c22d5e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt04020-info.jsp @@ -30,6 +30,16 @@ + +
+ + +
+ +
+ + +
@@ -66,20 +76,23 @@ * DatasetControl **************************************************************************/ var ${pageName}Control = new DatasetControl({ - prefix : "cvlcptDscsnCn" - , prefixName : "민원상담내용" + prefix : "cvlcptDscsn" + , prefixName : "민원상담" , keymapper : info => info ? info.CVLCPT_DSCSN_ID : "" - , dataGetter : obj => obj.cvlcptDscsnCn - , urls : { - create : wctx.url(${pageName}PrefixUrl + "/020/create.do") // 등록 - , update : wctx.url(${pageName}PrefixUrl + "/020/update.do") // 수정 - } + , dataGetter : obj => obj.cvlcptDscsn }); ${pageName}Control.onCurrentChange = item => { // Dataset 셋팅 ${pageName}Fields.set(item); + // 민원상담을 등록시 접수구분을 선택할 수 있게 한다. + if (item.data.CVLCPT_DSCSN_ID == null || item.data.CVLCPT_DSCSN_ID == "") { + $("#cvlcptRcptSeCd--${pageName}").prop("disabled", false); + } else { + $("#cvlcptRcptSeCd--${pageName}").prop("disabled", true); + } + // 업무구분에 따른 url 변경 ${pageName}Control.urls.create = wctx.url(item.data.TASK_SE_CD + ${pageName}PrefixUrl + "/020/create.do"); ${pageName}Control.urls.update = wctx.url(item.data.TASK_SE_CD + ${pageName}PrefixUrl + "/020/update.do"); @@ -118,13 +131,7 @@ **************************************************************************/ // 검색조건 초기값 셋팅 initForm${pageName} = () => { - let initDataset = ${cvlcptDscsnCn}; - - $("#cvlcptRcptSeCd--${pageName}").prop("disabled", true); - if (initDataset.CVLCPT_DSCSN_ID == undefined || initDataset.CVLCPT_DSCSN_ID == null) { - $("#cvlcptRcptSeCd--${pageName}").prop("disabled", false); - } } // 이벤트 설정 @@ -159,8 +166,7 @@ initForm${pageName}(); // Data 셋팅 - ${pageName}Control.setData([${cvlcptDscsnCn}]); + ${pageName}Control.setData([${cvlcptDscsn}]); }); -// #sourceURL=sprt04020-info.jsp