diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java new file mode 100644 index 00000000..97594bcc --- /dev/null +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java @@ -0,0 +1,86 @@ +package cokr.xit.fims.cmmn; + +import cokr.xit.foundation.component.QueryRequest; + +public class CmmnQuery extends QueryRequest { + + private static final long serialVersionUID = 1L; + + private String mainOption; + + private String subOption; + + private String thisDay; + + private String taskSeCd; //업무구분코드 + + private String schDateOpt; //검색 일자 구분 + + private String schDateFrom; //검색 일자 시작 + + private String schDateTo; // 검색 일자 종료 + + public String getMainOption() { + return ifEmpty(mainOption, () -> null); + } + + public T setMainOption(String mainOption) { + this.mainOption = mainOption; + return self(); + } + + public String getSubOption() { + return ifEmpty(subOption, () -> null); + } + + public T setSubOption(String subOption) { + this.subOption = subOption; + return self(); + } + + public String getThisDay() { + return ifEmpty(thisDay, () -> null); + } + + public T setThisDay(String thisDay) { + this.thisDay = thisDay; + return self(); + } + + public String getTaskSeCd() { + return ifEmpty(taskSeCd, () -> null); + } + + public T setTaskSeCd(String taskSeCd) { + this.taskSeCd = taskSeCd; + return self(); + } + + public String getSchDateOpt() { + return ifEmpty(schDateOpt, () -> null); + } + + public T setSchDateOpt(String schDateOpt) { + this.schDateOpt = schDateOpt; + return self(); + } + + public String getSchDateFrom() { + return ifEmpty(schDateFrom, () -> null); + } + + public T setSchDateFrom(String schDateFrom) { + this.schDateFrom = schDateFrom; + return self(); + } + + public String getSchDateTo() { + return ifEmpty(schDateTo, () -> null); + } + + public T setSchDateTo(String schDateTo) { + this.schDateTo = schDateTo; + return self(); + } + +} diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index ab0cd22d..a30198f3 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -1,6 +1,6 @@ package cokr.xit.fims.crdn; -import cokr.xit.foundation.component.QueryRequest; +import cokr.xit.fims.cmmn.CmmnQuery; /**단속 대장 정보 조회 요청 * @@ -12,24 +12,21 @@ import cokr.xit.foundation.component.QueryRequest; * ================================ * */ -public class CrdnQuery extends QueryRequest { +public class CrdnQuery extends CmmnQuery { private static final long serialVersionUID = 1L; - private String mainOption; - private String subOption; + private String view; private String grid; - private String thisDay; + private String currentUserId; private String currentInstitute; private String inspectionDataType; private String crdnId; private String[] crdnIDs; - private String taskSeCd; - private String schDateOpt; - private String schDateFrom; - private String schDateTo; + + private String vhrno; private String cvlcptPrcsPicNm; @@ -54,24 +51,6 @@ public class CrdnQuery extends QueryRequest { private String dtlAmtDcsnCdGroupId; private String dtlAmtDcsnCd; - public String getMainOption() { - return ifEmpty(mainOption, () -> null); - } - - public T setMainOption(String mainOption) { - this.mainOption = mainOption; - return self(); - } - - public String getSubOption() { - return ifEmpty(subOption, () -> null); - } - - public T setSubOption(String subOption) { - this.subOption = subOption; - return self(); - } - public String getView() { return ifEmpty(view, () -> null); } @@ -90,15 +69,6 @@ public class CrdnQuery extends QueryRequest { return self(); } - public String getThisDay() { - return ifEmpty(thisDay, () -> null); - } - - public T setThisDay(String thisDay) { - this.thisDay = thisDay; - return self(); - } - public String getCurrentUserId() { return ifEmpty(currentUserId, () -> null); } @@ -144,42 +114,6 @@ public class CrdnQuery extends QueryRequest { return self(); } - public String getTaskSeCd() { - return ifEmpty(taskSeCd, () -> null); - } - - public T setTaskSeCd(String taskSeCd) { - this.taskSeCd = taskSeCd; - return self(); - } - - public String getSchDateOpt() { - return ifEmpty(schDateOpt, () -> null); - } - - public T setSchDateOpt(String schDateOpt) { - this.schDateOpt = schDateOpt; - return self(); - } - - public String getSchDateFrom() { - return ifEmpty(schDateFrom, () -> null); - } - - public T setSchDateFrom(String schDateFrom) { - this.schDateFrom = schDateFrom; - return self(); - } - - public String getSchDateTo() { - return ifEmpty(schDateTo, () -> null); - } - - public T setSchDateTo(String schDateTo) { - this.schDateTo = schDateTo; - return self(); - } - public String getVhrno() { return ifEmpty(vhrno, () -> null); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp index d911c01d..db67e90b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp @@ -336,14 +336,14 @@ $(document).ready(function(){ var taskSeCd = $("#frmSearch--${pageName} input[name='taskSeCd']:checked").val(); - var dialogId = "cvlcptOrgnlDialog--${pageName}"; + var dialogId = "answerPreviewDialog--${pageName}"; ajax.get({ url : wctx.url("/"+taskSeCd+"/crdn/crdn01/060/info.do"), data : { crdnId : cur["CRDN_ID"] }, success : resp => { dialog.open({ id : dialogId, - title : "민원내역 원본", + title : "답변내용 미리보기", content : resp, size : "xl", init : () => {