diff --git a/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java b/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java index de20b35f..c2b689a7 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/OpnnSbmsnMapper.java @@ -114,8 +114,8 @@ public interface OpnnSbmsnMapper extends AbstractMapper { *
  • 그렇지 않으면 false
    • * */ - default boolean updateOpnnSbmsnAnswer(OpnnSbmsn excl02) { - return excl02 != null && updateAnsSttsCd(params().set("excl02", excl02)) == 1; + default boolean updateOpnnSbmsnAnswer(OpnnSbmsn opnnSbmsn) { + return opnnSbmsn != null && updateAnsSttsCd(params().set("opnnSbmsn", opnnSbmsn)) == 1; } /**단속 대장 정보를 수정한다. 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 8ff657a2..2cb7797c 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -399,8 +399,6 @@ , OPNN_SBMSN_SE_CD = #{opnnSbmsn.opnnSbmsnSeCd} /* 의견 제출 구분 코드 */ , OPNN_SBMSN_GIST = #{opnnSbmsn.opnnSbmsnGist} /* 의견 제출 요지 */ , ATCH_FILE_CNT = #{opnnSbmsn.atchFileCnt} /* 첨부 파일 수 */ - , DOC_NO = #{opnnSbmsn.docNo} /* 문서 번호 */ - , NTFCTN_SE_CD = #{opnnSbmsn.ntfctnSeCd} /* 통보 구분 코드 */ , PIC_RVW_OPNN = #{opnnSbmsn.picRvwOpnn} /* 담당자 검토 의견 */ , MDFCN_DT = #{opnnSbmsn.lastModified} /* 수정 일시 */ , MDFR = #{opnnSbmsn.modifiedBy} /* 수정자 */ @@ -411,8 +409,9 @@ /* 의견제출 대장 답변 수정(opnnSbmsnMapper.updateAnsSttsCd) */ UPDATE TB_OPNN_SBMSN SET OPNN_SBMSN_GIST = #{opnnSbmsn.opnnSbmsnGist} /* 의견 제출 요지 */ - , PIC_RVW_OPNN = #{opnnSbmsn.picRvwOpnn} /* 담당자 검토 의견 */ + , DOC_NO = #{opnnSbmsn.docNo} /* 문서 번호 */ , NTFCTN_SE_CD = #{opnnSbmsn.ntfctnSeCd} /* 통보 구분 코드 */ + , PIC_RVW_OPNN = #{opnnSbmsn.picRvwOpnn} /* 담당자 검토 의견 */ , OPNN_SBMSN_STTS_CD = #{opnnSbmsn.opnnSbmsnSttsCd} /* 의견 제출 상태 코드 */ , ANS_YMD = #{opnnSbmsn.ansYmd} /* 답변 일자 */ , ANS_TM = #{opnnSbmsn.ansTm} /* 답변 시각 */ 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 de5d3e28..7d271578 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 @@ -435,7 +435,7 @@ resp = resp.replace(/infoPrefix/g, this.prefix) .replace(/prefixName/g, this.prefixName) dialog.open({ - id : ${pageName}Control.prefixed("dialog") + id : ${pageName}Control.prefixed("SbmsnInfoDialog") , title : "의견제출 답변 처리" , content : resp , size : "lg" diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp index 291a40cc..718e2916 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp @@ -27,16 +27,6 @@ - -
    - - -
    @@ -49,6 +39,16 @@ data-fmt-type="day" title="날짜 선택" maxlength="10" required />
    + +
    + + +
    diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02030-info.jsp index e678ed8b..83701b94 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02030-info.jsp @@ -44,6 +44,11 @@
    + +
    + + +
    @@ -113,7 +118,7 @@ * DatasetControl **************************************************************************/ var ${pageName}Control = new DatasetControl({ - prefix : "opnn" + prefix : "opnnSbmsnInfo" , prefixName : "의견제출 답변" , keymapper : info => info ? info.OPNN_ID : "" , dataGetter : obj => obj.opnnSbmsnInfo @@ -138,7 +143,7 @@ ${pageName}Control.onSave = (resp) => { if (resp.saved) { dialog.alert("저장됐습니다."); - dialog.close(${pageName}Control.prefix + "dialog"); + dialog.close(${pageName}Control.prefix + "Dialog"); } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp index 465425a3..9deec089 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp @@ -45,6 +45,11 @@
    + +
    + + +
    @@ -141,16 +146,21 @@
    - +
    - - + +
    + +
    + + +
    @@ -220,14 +230,12 @@ url : wctx.url("/excl/excl02/020/info.do") , data : params || {} , success : resp => { - resp = resp.replace(/infoPrefix/g, this.prefix) - .replace(/prefixName/g, this.prefixName) dialog.open({ id : "opnnInfoDialog" , title : dialogTitle , content : resp , size : "xl" - , onClose : () => { fnDataRefreshInfo(); } // callback 자료 조회 + , onClose : () => { fnDataRefreshInfo(params.crdnId); } // callback 자료 조회 }); } }); @@ -255,13 +263,13 @@ url : wctx.url("/excl/excl02/030/info.do") , data : params || {} , success : resp => { - resp = resp.replace(/infoPrefix/g, this.prefix) - .replace(/prefixName/g, this.prefixName) + dialog.open({ - id : "opnnInfoDialog" + id : "opnnSbmsnInfoDialog" , title : "의견제출 답변 처리" , content : resp , size : "lg" + , onClose : () => { fnDataRefreshInfo(params.crdnId); } // callback 자료 조회 }); } });