From 9f222420f746ce407a383c148cebf2d6b9b86f02 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 2 Aug 2023 13:22:58 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EC=83=81=EC=84=B8=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=95=84=EC=9D=B4=EC=BD=98=20=ED=86=A0?= =?UTF-8?q?=EA=B8=80=20=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80=202.=20?= =?UTF-8?q?=EC=B9=B4=EB=A9=9C=ED=91=9C=EA=B8=B0=EB=B2=95->=EC=BC=80?= =?UTF-8?q?=EB=B0=A5=ED=91=9C=EA=B8=B0=EB=B2=95=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 29 +++++++++++++------ .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 3 +- .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp | 3 +- src/main/webapp/WEB-INF/jsp/include/tail.jsp | 2 +- .../js/fims/framework/cmm/cmmUtil.js | 8 +++++ ...initDatepicker.js => initAfterPageLoad.js} | 13 ++++++++- 6 files changed, 45 insertions(+), 13 deletions(-) rename src/main/webapp/resources/js/fims/framework/cmm/{initDatepicker.js => initAfterPageLoad.js} (54%) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 4276d2f2..5bc7a1e5 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -16,38 +16,49 @@ public class CrdnQuery extends CmmnQuery { private static final long serialVersionUID = 1L; + //조회유형 private String view; private String grid; private String inspectionDataType; + //현재정보 private String currentUserId; private String currentInstitute; + //ID private String crdnId; private String[] crdnIDs; + private String amtDcsnCdGroupId; + private String dtlAmtDcsnCdGroupId; - private String vhrno; - private String cvlcptPrcsPicNm; + //날짜 + private String aplcnYmd; private String schCvlcptRcptYmdFrom; private String schCvlcptRcptYmdTo; private String schRductYmdFrom; private String schRductYmdTo; private String schCrdnYmdFrom; private String schCrdnYmdTo; + + //from, to private Integer schCrdnCntFrom; private Integer schCrdnCntTo; + + //코드 + private String amtDcsnCd; + private String dtlAmtDcsnCd; + private String crdnInptSeCd; + private String cvlcptPrcsCd; + + //포함, 제외, 특정 자료 private String schOnlySamePlace; private String schOnlyUnpay; private String schExclEnd; private String schExclTimeout; - private String crdnInptSeCd; - private String cvlcptPrcsCd; - private String aplcnYmd; - private String amtDcsnCdGroupId; - private String amtDcsnCd; - private String dtlAmtDcsnCdGroupId; - private String dtlAmtDcsnCd; + //기타 + private String vhrno; + private String cvlcptPrcsPicNm; public String getView() { return ifEmpty(view, () -> null); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 4d094f2f..87a834a9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -392,7 +392,8 @@ $(document).ready(function(){ * 초기화 **************************************************************************/ initDatepicker("frmSearch--${pageName}"); //달력 초기화 - + initDetailSearchButton("frmSearch--${pageName}"); + var defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val(); $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked",true); $P.fnResetAndChangeBiz(defaultBizValue); 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 00282104..996611ca 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 @@ -717,7 +717,8 @@ $(document).ready(function(){ * 초기화 **************************************************************************/ initDatepicker("frmSearch--${pageName}"); //달력 초기화 - + initDetailSearchButton("frmSearch--${pageName}"); + var defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val(); $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked",true); $P.fnResetAndChangeBiz(defaultBizValue); diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp index 8a744695..129609e7 100644 --- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp @@ -51,7 +51,7 @@ - + diff --git a/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js b/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js index 14a65c4c..8b68f242 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js @@ -262,3 +262,11 @@ function snakeToCamel(text){ } return text; } + +/** + * 카멜 표기법을 케밥 표기법으로 변경한다. + * @return 치환된 문자열 + */ +function camelToKebab(text){ + return text.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase(); +} diff --git a/src/main/webapp/resources/js/fims/framework/cmm/initDatepicker.js b/src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js similarity index 54% rename from src/main/webapp/resources/js/fims/framework/cmm/initDatepicker.js rename to src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js index e2b550a4..8259e0b1 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/initDatepicker.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/initAfterPageLoad.js @@ -14,4 +14,15 @@ function initDatepicker(elementId){ }); } - \ No newline at end of file + +function initDetailSearchButton(elementId){ + + var executionArea = $("#"+elementId); + + /*--------------------- 상세검색 버튼 제어 ---------------------*/ + executionArea.find(".btn-open-detail").on("click", function() { + $(this).find('i').toggleClass('bx-chevron-down'); + $(this).find('i').toggleClass('bx-chevron-up'); + }); + +} \ No newline at end of file