From 6feb16da96a908299a0fb63326e5a74439854851 Mon Sep 17 00:00:00 2001 From: jjh Date: Wed, 6 Sep 2023 15:21:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=82=AC=EC=9A=A9=EB=90=98=EB=8A=94=20Query=20?= =?UTF-8?q?=EC=9E=90=EB=B0=94=20=EC=86=8C=EC=8A=A4=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/cmmn/CmmnQuery.java | 113 ++++++++- .../xit/fims/cmmn/CrdnPayerHstryQuery.java | 23 +- .../xit/fims/cmmn/CrdnSttsHstryQuery.java | 33 +-- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 10 - .../java/cokr/xit/fims/excl/ExclQuery.java | 225 ++---------------- .../java/cokr/xit/fims/levy/LevyQuery.java | 73 +++--- .../java/cokr/xit/fims/rcvm/RcvmQuery.java | 49 +--- .../java/cokr/xit/fims/sndb/SndbQuery.java | 49 +--- .../java/cokr/xit/fims/sprt/SprtQuery.java | 61 ++--- 9 files changed, 223 insertions(+), 413 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java index 97594bcc..ade1bf54 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java @@ -7,18 +7,25 @@ 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; // 검색 일자 종료 + private String sggCd; // 시군구 코드 + private String taskSeCd; // 업무구분코드 + + private String schDateOpt; // 검색 일자 구분 + private String schDateFrom; // 검색 일자 시작 + private String schDateTo; // 검색 일자 종료 + private String schRegDateOpt; // 등록 일자 구분 + private String schRegDateFrom; // 등록 일자 시작 + private String schRegDateTo; // 등록 일자 종료 + private String schDetailDateOpt; // 상세 검색 일자 구분 + private String schDetailDateFrom; // 상세 검색 일자 시작 + private String schDetailDateTo; // 상세 검색 일자 종료 + private String schDetailUserOpt; // 상세 검색 사용자 구분 + private String schDetailUserNm; // 상세 검색 사용자 명 + private String schDetailUserCd; // 상세 검색 사용자 코드 public String getMainOption() { return ifEmpty(mainOption, () -> null); @@ -47,6 +54,15 @@ public class CmmnQuery extends QueryRequest { return self(); } + public String getSggCd() { + return ifEmpty(sggCd, () -> null); + } + + public T setSggCd(String sggCd) { + this.sggCd = sggCd; + return self(); + } + public String getTaskSeCd() { return ifEmpty(taskSeCd, () -> null); } @@ -83,4 +99,85 @@ public class CmmnQuery extends QueryRequest { return self(); } + public String getSchRegDateOpt() { + return ifEmpty(schRegDateOpt, () -> null); + } + + public T setSchRegDateOpt(String schRegDateOpt) { + this.schRegDateOpt = schRegDateOpt; + return self(); + } + + public String getSchRegDateFrom() { + return ifEmpty(schRegDateFrom, () -> null); + } + + public T setSchRegDateFrom(String schRegDateFrom) { + this.schRegDateFrom = schRegDateFrom; + return self(); + } + + public String getSchRegDateTo() { + return ifEmpty(schRegDateTo, () -> null); + } + + public T setSchRegDateTo(String schRegDateTo) { + this.schRegDateTo = schRegDateTo; + return self(); + } + + public String getSchDetailDateOpt() { + return ifEmpty(schDetailDateOpt, () -> null); + } + + public T setSchDetailDateOpt(String schDetailDateOpt) { + this.schDetailDateOpt = schDetailDateOpt; + return self(); + } + + public String getSchDetailDateFrom() { + return ifEmpty(schDetailDateFrom, () -> null); + } + + public T setSchDetailDateFrom(String schDetailDateFrom) { + this.schDetailDateFrom = schDetailDateFrom; + return self(); + } + + public String getSchDetailDateTo() { + return ifEmpty(schDetailDateTo, () -> null); + } + + public T setSchDetailDateTo(String schDetailDateTo) { + this.schDetailDateTo = schDetailDateTo; + return self(); + } + + public String getSchDetailUserOpt() { + return ifEmpty(schDetailUserOpt, () -> null); + } + + public T setSchDetailUserOpt(String schDetailUserOpt) { + this.schDetailUserOpt = schDetailUserOpt; + return self(); + } + + public String getSchDetailUserNm() { + return ifEmpty(schDetailUserNm, () -> null); + } + + public T setSchDetailUserNm(String schDetailUserNm) { + this.schDetailUserNm = schDetailUserNm; + return self(); + } + + public String getSchDetailUserCd() { + return ifEmpty(schDetailUserCd, () -> null); + } + + public T setSchDetailUserCd(String schDetailUserCd) { + this.schDetailUserCd = schDetailUserCd; + return self(); + } + } diff --git a/src/main/java/cokr/xit/fims/cmmn/CrdnPayerHstryQuery.java b/src/main/java/cokr/xit/fims/cmmn/CrdnPayerHstryQuery.java index 1c7cdd79..654b3be7 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CrdnPayerHstryQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/CrdnPayerHstryQuery.java @@ -1,7 +1,5 @@ package cokr.xit.fims.cmmn; -import cokr.xit.foundation.component.QueryRequest; - /**단속 납부자 이력 정보 조회 요청 * *

상세 설명: @@ -12,24 +10,13 @@ import cokr.xit.foundation.component.QueryRequest; * ================================ * */ -public class CrdnPayerHstryQuery extends QueryRequest { +public class CrdnPayerHstryQuery extends CmmnQuery { private static final long serialVersionUID = 1L; - /** - * 상태 이력 ID - */ - private String chgHstryId; - - /** - * 단속 ID - */ - private String crdnId; - - /** - * 납부자 ID - */ - private String rtpyrId; + private String chgHstryId; // 상태 이력 ID + private String crdnId; // 단속 ID + private String rtpyrId; // 납부자 ID public String getChgHstryId() { return ifEmpty(chgHstryId, () -> null); @@ -61,4 +48,4 @@ public class CrdnPayerHstryQuery extends QueryRequest { return self(); } -} \ No newline at end of file +} diff --git a/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstryQuery.java b/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstryQuery.java index c03d53eb..3381a772 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstryQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/CrdnSttsHstryQuery.java @@ -1,7 +1,5 @@ package cokr.xit.fims.cmmn; -import cokr.xit.foundation.component.QueryRequest; - /**단속 상태 이력 정보 조회 요청 * *

상세 설명: @@ -12,34 +10,15 @@ import cokr.xit.foundation.component.QueryRequest; * ================================ * */ -public class CrdnSttsHstryQuery extends QueryRequest { +public class CrdnSttsHstryQuery extends CmmnQuery { private static final long serialVersionUID = 1L; - /** - * 상태 이력 ID - */ - private String sttsHstryId; - - /** - * 단속 ID - */ - private String crdnId; - - /** - * 단속 상태 코드 - */ - private String crdnSttsCd; - - /** - * 업무 상세 ID - */ - private String taskDtlId; - - /** - * 사용 여부 - */ - private String useYn; + private String sttsHstryId; // 상태 이력 ID + private String crdnId; // 단속 ID + private String crdnSttsCd; // 단속 상태 코드 + private String taskDtlId; // 업무 상세 ID + private String useYn; // 사용 여부 public String getSttsHstryId() { return ifEmpty(sttsHstryId, () -> null); diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index c06df93c..0059d690 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -47,7 +47,6 @@ public class CrdnQuery extends CmmnQuery { private Integer schCrdnCntTo; //코드 - private String sggCd; private String amtDcsnCd; private String dtlAmtDcsnCd; private String crdnInptSeCd; @@ -359,15 +358,6 @@ public class CrdnQuery extends CmmnQuery { return self(); } - public String getSggCd() { - return ifEmpty(sggCd, () -> null); - } - - public T setSggCd(String sggCd) { - this.sggCd = sggCd; - return self(); - } - public String getAmtDcsnCd() { return ifEmpty(amtDcsnCd, () -> null); } diff --git a/src/main/java/cokr/xit/fims/excl/ExclQuery.java b/src/main/java/cokr/xit/fims/excl/ExclQuery.java index 9c41a9e7..9a7ebc44 100644 --- a/src/main/java/cokr/xit/fims/excl/ExclQuery.java +++ b/src/main/java/cokr/xit/fims/excl/ExclQuery.java @@ -1,6 +1,6 @@ package cokr.xit.fims.excl; -import cokr.xit.foundation.component.QueryRequest; +import cokr.xit.fims.cmmn.CmmnQuery; /**부과제외 대장 정보 조회 요청 * @@ -12,14 +12,10 @@ import cokr.xit.foundation.component.QueryRequest; * ================================ * */ -public class ExclQuery extends QueryRequest { +public class ExclQuery extends CmmnQuery { private static final long serialVersionUID = 1L; - // 필수 조건 - private String sggCd; // 시군구 코드 - private String taskSeCd; // 업무 구분 코드 - private String delYn; // 삭제 여부 // ID private String crdnId; // 단속 ID private String[] levyExclIDs; // 부과제외 IDs @@ -28,19 +24,6 @@ public class ExclQuery extends QueryRequest { private String opnnId; // 의견제출 ID private String[] reRegIDs; // 재등록 IDs private String reRegId; // 재등록 ID - // 공통 조건 - private String schDateOpt; // 검색 일자 구분 - private String schDateFrom; // 검색 일자 시작 - private String schDateTo; // 검색 일자 종료 - private String schRegDateOpt; // 등록 일자 구분 - private String schRegDateFrom; // 등록 일자 시작 - private String schRegDateTo; // 등록 일자 종료 - private String schDetailDateOpt; // 상세 검색 일자 구분 - private String schDetailDateFrom; // 상세 검색 일자 시작 - private String schDetailDateTo; // 상세 검색 일자 종료 - private String schDetailUserOpt; // 상세 검색 사용자 구분 - private String schDetailUserNm; // 상세 검색 사용자 명 - private String schDetailUserCd; // 상세 검색 사용자 코드 // 검색 조건 private String schLevyExclYmdFrom; // 부과제외_부과제외 일자 시작 private String schLevyExclYmdTo; // 부과제외_부과제외 일자 종료 @@ -58,49 +41,17 @@ public class ExclQuery extends QueryRequest { private String schCrdnYmdTo; // 단속(TB_CRDN)_단속 일자 종료 private String schRtpyrNm; // 납부자(TB_PAYER)_납부자 명 // 동적 검색 조건 - private String mainOption; - private String subOption; - private String grid; private String levyExclSeCd; // 부과제외_부과 제외 구분 코드 private String levyExclSeNm; // 부과제외_부과 제외 구분 명 private String vhrno; // 단속(TB_CRDN)_차량번호 private String rtpyrNm; // 납부자(TB_PAYER)_납부자 명 // ETC private String callPurpose; // 호출용도 필요시 사용(select, create, update) - private String ansRsnCd; // 민원 답변 문구(TB_CVLCPT_ANS_WORDS) - 답변 사유 코드 + private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 + private String ansRsnCd; // 민원 답변 문구(TB_CVLCPT_ANS_WORDS) - 답변 사유 코드 private String sndngRcvmtCd; // 발송 수납 코드 - public String getSggCd() { - return ifEmpty(sggCd, () -> null); - } - - public T setSggCd(String sggCd) { - this.sggCd = sggCd; - - return self(); - } - - public String getTaskSeCd() { - return ifEmpty(taskSeCd, () -> null); - } - - public T setTaskSeCd(String taskSeCd) { - this.taskSeCd = taskSeCd; - - return self(); - } - - public String getDelYn() { - return ifEmpty(delYn, () -> null); - } - - public T setDelYn(String delYn) { - this.delYn = delYn; - - return self(); - } - public String getCrdnId() { return ifEmpty(crdnId, () -> null); } @@ -171,126 +122,6 @@ public class ExclQuery extends QueryRequest { 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 getSchRegDateOpt() { - return ifEmpty(schRegDateOpt, () -> null); - } - - public T setSchRegDateOpt(String schRegDateOpt) { - this.schRegDateOpt = schRegDateOpt; - - return self(); - } - - public String getSchRegDateFrom() { - return ifEmpty(schRegDateFrom, () -> null); - } - - public T setSchRegDateFrom(String schRegDateFrom) { - this.schRegDateFrom = schRegDateFrom; - - return self(); - } - - public String getSchRegDateTo() { - return ifEmpty(schRegDateTo, () -> null); - } - - public T setSchRegDateTo(String schRegDateTo) { - this.schRegDateTo = schRegDateTo; - - return self(); - } - - public String getSchDetailDateOpt() { - return ifEmpty(schDetailDateOpt, () -> null); - } - - public T setSchDetailDateOpt(String schDetailDateOpt) { - this.schDetailDateOpt = schDetailDateOpt; - - return self(); - } - - public String getSchDetailDateFrom() { - return ifEmpty(schDetailDateFrom, () -> null); - } - - public T setSchDetailDateFrom(String schDetailDateFrom) { - this.schDetailDateFrom = schDetailDateFrom; - - return self(); - } - - public String getSchDetailDateTo() { - return ifEmpty(schDetailDateTo, () -> null); - } - - public T setSchDetailDateTo(String schDetailDateTo) { - this.schDetailDateTo = schDetailDateTo; - - return self(); - } - - public String getSchDetailUserOpt() { - return ifEmpty(schDetailUserOpt, () -> null); - } - - public T setSchDetailUserOpt(String schDetailUserOpt) { - this.schDetailUserOpt = schDetailUserOpt; - - return self(); - } - - public String getSchDetailUserNm() { - return ifEmpty(schDetailUserNm, () -> null); - } - - public T setSchDetailUserNm(String schDetailUserNm) { - this.schDetailUserNm = schDetailUserNm; - - return self(); - } - - public String getSchDetailUserCd() { - return ifEmpty(schDetailUserCd, () -> null); - } - - public T setSchDetailUserCd(String schDetailUserCd) { - this.schDetailUserCd = schDetailUserCd; - - return self(); - } - public String getSchLevyExclYmdFrom() { return ifEmpty(schLevyExclYmdFrom, () -> null); } @@ -442,36 +273,6 @@ public class ExclQuery extends QueryRequest { } // 동적 검색 조건 /////////////////////////////////////////////////////////////// - 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 getGrid() { - return ifEmpty(grid, () -> null); - } - - public T setGrid(String grid) { - this.grid = grid; - - return self(); - } - public String getLevyExclSeNm() { return ifEmpty(levyExclSeNm, () -> null); } @@ -524,12 +325,12 @@ public class ExclQuery extends QueryRequest { return self(); } - public String getAnsRsnCd() { - return ifEmpty(ansRsnCd, () -> null); + public String getDelYn() { + return ifEmpty(delYn, () -> null); } - public T setAnsRsnCd(String ansRsnCd) { - this.ansRsnCd = ansRsnCd; + public T setDelYn(String delYn) { + this.delYn = delYn; return self(); } @@ -544,6 +345,16 @@ public class ExclQuery extends QueryRequest { return self(); } + public String getAnsRsnCd() { + return ifEmpty(ansRsnCd, () -> null); + } + + public T setAnsRsnCd(String ansRsnCd) { + this.ansRsnCd = ansRsnCd; + + return self(); + } + public String getSndngRcvmtCd() { return ifEmpty(sndngRcvmtCd, () -> null); } diff --git a/src/main/java/cokr/xit/fims/levy/LevyQuery.java b/src/main/java/cokr/xit/fims/levy/LevyQuery.java index f9687dc7..1f8cf11f 100644 --- a/src/main/java/cokr/xit/fims/levy/LevyQuery.java +++ b/src/main/java/cokr/xit/fims/levy/LevyQuery.java @@ -16,45 +16,23 @@ public class LevyQuery extends CmmnQuery { private static final long serialVersionUID = 1L; - // 필수 조건 - private String sggCd; // 시군구 코드 - private String delYn; // 삭제 여부 // ID private String crdnId; // 단속 ID private String[] levyIDs; // 부과 IDs private String levyId; // 부과 ID private String[] rductIDs; // 감경 IDs private String rductId; // 감경 ID - - //날짜 - private String schRductYmdFrom; - private String schRductYmdTo; - + // 검색 조건 + private String schRductYmdFrom; // 감경 일자 시작 + private String schRductYmdTo; // 감경 일자 종료 + private String schCrdnYmdFrom; // 단속 일자 시작 + private String schCrdnYmdTo; // 단속 일자 종료 + private String schVhrno; // 차량번호 // ETC private String callPurpose; // 호출용도 필요시 사용(select, create, update) + private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 - - public String getSggCd() { - return ifEmpty(sggCd, () -> null); - } - - public T setSggCd(String sggCd) { - this.sggCd = sggCd; - - return self(); - } - - public String getDelYn() { - return ifEmpty(delYn, () -> null); - } - - public T setDelYn(String delYn) { - this.delYn = delYn; - - return self(); - } - public String getCrdnId() { return ifEmpty(crdnId, () -> null); } @@ -123,6 +101,33 @@ public class LevyQuery extends CmmnQuery { return self(); } + public String getSchCrdnYmdFrom() { + return ifEmpty(schCrdnYmdFrom, () -> null); + } + + public T setSchCrdnYmdFrom(String schCrdnYmdFrom) { + this.schCrdnYmdFrom = schCrdnYmdFrom; + return self(); + } + + public String getSchCrdnYmdTo() { + return ifEmpty(schCrdnYmdTo, () -> null); + } + + public T setSchCrdnYmdTo(String schCrdnYmdTo) { + this.schCrdnYmdTo = schCrdnYmdTo; + return self(); + } + + public String getSchVhrno() { + return ifEmpty(schVhrno, () -> null); + } + + public T setSchVhrno(String schVhrno) { + this.schVhrno = schVhrno; + return self(); + } + // ETC ///////////////////////////////////////////////////////////////////// public String getCallPurpose() { return ifEmpty(callPurpose, () -> null); @@ -134,6 +139,16 @@ public class LevyQuery extends CmmnQuery { return self(); } + public String getDelYn() { + return ifEmpty(delYn, () -> null); + } + + public T setDelYn(String delYn) { + this.delYn = delYn; + + return self(); + } + public String getDelRsn() { return ifEmpty(delRsn, () -> null); } diff --git a/src/main/java/cokr/xit/fims/rcvm/RcvmQuery.java b/src/main/java/cokr/xit/fims/rcvm/RcvmQuery.java index 27a7ce3a..7ac9dfcd 100644 --- a/src/main/java/cokr/xit/fims/rcvm/RcvmQuery.java +++ b/src/main/java/cokr/xit/fims/rcvm/RcvmQuery.java @@ -1,6 +1,6 @@ package cokr.xit.fims.rcvm; -import cokr.xit.foundation.component.QueryRequest; +import cokr.xit.fims.cmmn.CmmnQuery; /**수납 대장 정보 조회 요청 * @@ -12,14 +12,10 @@ import cokr.xit.foundation.component.QueryRequest; * ================================ * */ -public class RcvmQuery extends QueryRequest { +public class RcvmQuery extends CmmnQuery { private static final long serialVersionUID = 1L; - // 필수 조건 - private String sggCd; // 시군구 코드 - private String taskSeCd; // 업무 구분 코드 - private String delYn; // 삭제 여부 // ID private String crdnId; // 단속 ID private String levyId; // 부과 ID @@ -27,38 +23,9 @@ public class RcvmQuery extends QueryRequest { private String rcvmtId; // 수납 ID // ETC private String callPurpose; // 호출용도 필요시 사용(select, create, update) + private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 - public String getSggCd() { - return ifEmpty(sggCd, () -> null); - } - - public T setSggCd(String sggCd) { - this.sggCd = sggCd; - - return self(); - } - - public String getTaskSeCd() { - return ifEmpty(taskSeCd, () -> null); - } - - public T setTaskSeCd(String taskSeCd) { - this.taskSeCd = taskSeCd; - - return self(); - } - - public String getDelYn() { - return ifEmpty(delYn, () -> null); - } - - public T setDelYn(String delYn) { - this.delYn = delYn; - - return self(); - } - public String getCrdnId() { return ifEmpty(crdnId, () -> null); } @@ -110,6 +77,16 @@ public class RcvmQuery extends QueryRequest { return self(); } + public String getDelYn() { + return ifEmpty(delYn, () -> null); + } + + public T setDelYn(String delYn) { + this.delYn = delYn; + + return self(); + } + public String getDelRsn() { return ifEmpty(delRsn, () -> null); } diff --git a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java index 9a4d55b6..cf828fcf 100644 --- a/src/main/java/cokr/xit/fims/sndb/SndbQuery.java +++ b/src/main/java/cokr/xit/fims/sndb/SndbQuery.java @@ -1,6 +1,6 @@ package cokr.xit.fims.sndb; -import cokr.xit.foundation.component.QueryRequest; +import cokr.xit.fims.cmmn.CmmnQuery; /**발송 대장 정보 조회 요청 * @@ -12,14 +12,10 @@ import cokr.xit.foundation.component.QueryRequest; * ================================ * */ -public class SndbQuery extends QueryRequest { +public class SndbQuery extends CmmnQuery { private static final long serialVersionUID = 1L; - // 필수 조건 - private String sggCd; // 시군구 코드 - private String taskSeCd; // 업무 구분 코드 - private String delYn; // 삭제 여부 // ID private String crdnId; // 단속 ID private String[] sndngIDs; // 발송 IDs @@ -30,38 +26,9 @@ public class SndbQuery extends QueryRequest { private String svbtcId; // 공시송달 ID // ETC private String callPurpose; // 호출용도 필요시 사용(select, create, update) + private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 - public String getSggCd() { - return ifEmpty(sggCd, () -> null); - } - - public T setSggCd(String sggCd) { - this.sggCd = sggCd; - - return self(); - } - - public String getTaskSeCd() { - return ifEmpty(taskSeCd, () -> null); - } - - public T setTaskSeCd(String taskSeCd) { - this.taskSeCd = taskSeCd; - - return self(); - } - - public String getDelYn() { - return ifEmpty(delYn, () -> null); - } - - public T setDelYn(String delYn) { - this.delYn = delYn; - - return self(); - } - public String getCrdnId() { return ifEmpty(crdnId, () -> null); } @@ -143,6 +110,16 @@ public class SndbQuery extends QueryRequest { return self(); } + public String getDelYn() { + return ifEmpty(delYn, () -> null); + } + + public T setDelYn(String delYn) { + this.delYn = delYn; + + return self(); + } + public String getDelRsn() { return ifEmpty(delRsn, () -> null); } diff --git a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java index b7aec158..af8fe60e 100644 --- a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -1,15 +1,11 @@ package cokr.xit.fims.sprt; -import cokr.xit.foundation.component.QueryRequest; +import cokr.xit.fims.cmmn.CmmnQuery; -public class SprtQuery extends QueryRequest { +public class SprtQuery extends CmmnQuery { private static final long serialVersionUID = 1L; - // 필수조건 - private String sggCd; // 시군구 코드 - private String taskSeCd; // 업무 구분 코드 - private String delYn; // 삭제 여부 // ID private String crdnId; // 단속 ID private String levyExclId; // 부과 제외 ID @@ -23,38 +19,9 @@ public class SprtQuery extends QueryRequest { private String levyNo; // 부과 번호 // ETC private String callPurpose; // 호출용도 필요시 사용(select, create, update) - private String inquiryCondition; // 조회조건 + private String delYn; // 삭제 여부 private String delRsn; // 삭제 사유 - - public String getSggCd() { - return ifEmpty(sggCd, () -> null); - } - - public T setSggCd(String sggCd) { - this.sggCd = sggCd; - - return self(); - } - - public String getTaskSeCd() { - return ifEmpty(taskSeCd, () -> null); - } - - public T setTaskSeCd(String taskSeCd) { - this.taskSeCd = taskSeCd; - - return self(); - } - - public String getDelYn() { - return ifEmpty(delYn, () -> null); - } - - public T setDelYn(String delYn) { - this.delYn = delYn; - - return self(); - } + private String inquiryCondition; // 조회 조건 public String getCrdnId() { return ifEmpty(crdnId, () -> null); @@ -135,7 +102,6 @@ public class SprtQuery extends QueryRequest { return self(); } - ; // 회계연도 public String getFyr() { return ifEmpty(fyr, () -> null); @@ -168,15 +134,16 @@ public class SprtQuery extends QueryRequest { return self(); } - public String getInquiryCondition() { - return ifEmpty(inquiryCondition, () -> null); + public String getDelYn() { + return ifEmpty(delYn, () -> null); } - public T setInquiryCondition(String inquiryCondition) { - this.inquiryCondition = inquiryCondition; + public T setDelYn(String delYn) { + this.delYn = delYn; return self(); } + public String getDelRsn() { return ifEmpty(delRsn, () -> null); } @@ -186,6 +153,16 @@ public class SprtQuery extends QueryRequest { return self(); } + + public String getInquiryCondition() { + return ifEmpty(inquiryCondition, () -> null); + } + + public T setInquiryCondition(String inquiryCondition) { + this.inquiryCondition = inquiryCondition; + + return self(); + } // ETC ///////////////////////////////////////////////////////////////////// }