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 @@
">
-">
+">
?${ver}">
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