From 92315548203122084484e683dd15eb20b8ec7e22 Mon Sep 17 00:00:00 2001 From: jjh Date: Thu, 24 Aug 2023 17:24:55 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=80=EA=B3=BC=EC=A0=9C=EC=99=B8=20?= =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=A0=95=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crdn/service/bean/CrdnServiceBean.java | 4 +- .../service/bean/CrdnCvlcptServiceBean.java | 6 +- .../fims/excl/{Excl03.java => CrdnReReg.java} | 16 +- .../java/cokr/xit/fims/excl/Excl02Query.java | 382 ------------------ .../java/cokr/xit/fims/excl/Excl03Query.java | 261 ------------ .../excl/{Excl01Query.java => ExclQuery.java} | 235 ++++++++--- .../fims/excl/{Excl01.java => LevyExcl.java} | 16 +- .../fims/excl/{Excl02.java => OpnnSbmsn.java} | 16 +- .../cokr/xit/fims/excl/dao/Excl01Mapper.java | 38 +- .../cokr/xit/fims/excl/dao/Excl02Mapper.java | 24 +- .../cokr/xit/fims/excl/dao/Excl03Mapper.java | 16 +- .../xit/fims/excl/service/Excl01Service.java | 16 +- .../xit/fims/excl/service/Excl02Service.java | 20 +- .../xit/fims/excl/service/Excl03Service.java | 12 +- .../fims/excl/service/bean/Excl01Bean.java | 25 +- .../excl/service/bean/Excl01ServiceBean.java | 32 +- .../fims/excl/service/bean/Excl02Bean.java | 20 +- .../excl/service/bean/Excl02ServiceBean.java | 38 +- .../fims/excl/service/bean/Excl03Bean.java | 12 +- .../excl/service/bean/Excl03ServiceBean.java | 14 +- .../xit/fims/excl/web/Excl01Controller.java | 22 +- .../xit/fims/excl/web/Excl02Controller.java | 20 +- .../xit/fims/excl/web/Excl03Controller.java | 10 +- .../sprt/service/bean/Sprt02ServiceBean.java | 10 +- .../sql/mapper/fims/excl/excl01-mapper.xml | 2 +- .../sql/mapper/fims/excl/excl02-mapper.xml | 2 +- .../sql/mapper/fims/excl/excl03-mapper.xml | 2 +- 27 files changed, 374 insertions(+), 897 deletions(-) rename src/main/java/cokr/xit/fims/excl/{Excl03.java => CrdnReReg.java} (73%) delete mode 100644 src/main/java/cokr/xit/fims/excl/Excl02Query.java delete mode 100644 src/main/java/cokr/xit/fims/excl/Excl03Query.java rename src/main/java/cokr/xit/fims/excl/{Excl01Query.java => ExclQuery.java} (50%) rename src/main/java/cokr/xit/fims/excl/{Excl01.java => LevyExcl.java} (88%) rename src/main/java/cokr/xit/fims/excl/{Excl02.java => OpnnSbmsn.java} (89%) diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java index 2a105974..caa49502 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java @@ -27,7 +27,7 @@ import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnService; import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper; import cokr.xit.fims.cvlc.service.bean.CrdnCvlcptBean; -import cokr.xit.fims.excl.Excl01; +import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.service.bean.Excl01Bean; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -203,7 +203,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService if(crdn.getCrdnSttsCd().equals("83")) { // 부과제외(TB_LEVY_EXCL) 대장 등록 - Excl01 excl01 = new Excl01(); + LevyExcl excl01 = new LevyExcl(); excl01.setSggCd(currentSggCd); excl01.setTaskSeCd(crdn.getTaskSeCd()); excl01.setCrdnId(crdn.getCrdnId()); diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index ea6526d2..61a3db20 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -37,7 +37,7 @@ import cokr.xit.fims.crdn.service.bean.CrdnStngBean; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; -import cokr.xit.fims.excl.Excl01; +import cokr.xit.fims.excl.LevyExcl; import cokr.xit.fims.excl.service.bean.Excl01Bean; import cokr.xit.fims.sprt.Sprt; import cokr.xit.foundation.component.AbstractServiceBean; @@ -320,7 +320,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } //부과제외 대장을 등록 한다. - Excl01 excl01 = new Excl01(); + LevyExcl excl01 = new LevyExcl(); excl01.setSggCd(globalStngMapper.selectSggCdForCurrentUser()); excl01.setTaskSeCd(crdnInfo.string("TASK_SE_CD")); excl01.setCrdnId(crdnInfo.string("CRDN_ID")); @@ -496,7 +496,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv String dtlTaskId = ""; if(acceptType.equals("someAccept") || acceptType.equals("nonAccept")) { //일부수용,불수용 boolean retSuccess = false; - Excl01 excl01 = new Excl01(); + LevyExcl excl01 = new LevyExcl(); excl01.setCrdnId(crdn.getCrdnId()); excl01.setSggCd(crdn.getSggCd()); excl01.setTaskSeCd(crdn.getTaskSeCd()); diff --git a/src/main/java/cokr/xit/fims/excl/Excl03.java b/src/main/java/cokr/xit/fims/excl/CrdnReReg.java similarity index 73% rename from src/main/java/cokr/xit/fims/excl/Excl03.java rename to src/main/java/cokr/xit/fims/excl/CrdnReReg.java index 1d795a43..2c922d80 100644 --- a/src/main/java/cokr/xit/fims/excl/Excl03.java +++ b/src/main/java/cokr/xit/fims/excl/CrdnReReg.java @@ -4,19 +4,13 @@ import cokr.xit.foundation.AbstractEntity; import lombok.Getter; import lombok.Setter; -/**단속 재등록 대장 -* -*

상세 설명: 단속 재등록 대장 엔티티를 데이터베이스에 저장하는 클래스다. -* -*

-* ============ 변경 이력 ============
-* 2023-07-03	JoJH 최초 작성
-* ================================
-* 
-*/ +/** + * 단속 재등록 대장 + * @author JoJH + */ @Getter @Setter -public class Excl03 extends AbstractEntity { +public class CrdnReReg extends AbstractEntity { public static String INF_TYPE = "100"; // 단속 사진 diff --git a/src/main/java/cokr/xit/fims/excl/Excl02Query.java b/src/main/java/cokr/xit/fims/excl/Excl02Query.java deleted file mode 100644 index e205e6e8..00000000 --- a/src/main/java/cokr/xit/fims/excl/Excl02Query.java +++ /dev/null @@ -1,382 +0,0 @@ -package cokr.xit.fims.excl; - -import cokr.xit.foundation.component.QueryRequest; - -/**부과제외 대장 정보 조회 요청 -* -*

상세 설명: -* -*

-* ============ 변경 이력 ============
-* 2023-06-23	JoJH 최초 작성
-* ================================
-* 
-*/ -public class Excl02Query extends QueryRequest { - - private static final long serialVersionUID = 1L; - - // 필수 조건 - private String sggCd; // 시군구 코드 - private String taskSeCd; // 업무 구분 코드 - private String delYn; // 삭제 여부 - // ID - private String[] opnnIDs; // 의견 제출 ID - private String opnnId; // 의견 제출 ID - private String crdnId; // 단속 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 schRcptYmdFrom; // 의견제출 접수 일자 시작 - private String schRcptYmdTo; // 의견제출 접수 일자 종료 - private String schAnsYmdFrom; // 의견제출 답변 일자 시작 - private String schAnsYmdTo; // 의견제출 답변 일자 종료 - private String schOpnnSbmsnSttsCd; // 의견 제출 상태 코드 - private String schSttrNm; // 진술자 명 - private String schVhrno; // 차량번호 - 단속(TB_CRDN) - private String schRtpyrNm; // 납부자 명 - 납부자(TB_PAYER) - private String schCrdnYmdFrom; // 단속 일자 시작 - 단속(TB_CRDN) - private String schCrdnYmdTo; // 단속 일자 종료 - 단속(TB_CRDN) - // 동적 검색 조건 - private String mainOption; - private String subOption; - // ETC - private String delRsn; // 삭제 사유 - private String callPurpose; // 호출용도 - - 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[] getOpnnIDs() { - return ifEmpty(opnnIDs, () -> null); - } - - public T setOpnnIDs(String... opnnIDs) { - this.opnnIDs = opnnIDs; - - return self(); - } - - public String getOpnnId() { - return ifEmpty(opnnId, () -> null); - } - - public T setOpnnId(String opnnId) { - this.opnnId = opnnId; - - return self(); - } - - public String getCrdnId() { - return ifEmpty(crdnId, () -> null); - } - - public T setCrdnId(String crdnId) { - this.crdnId = crdnId; - - 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 getSchRcptYmdFrom() { - return ifEmpty(schRcptYmdFrom, () -> null); - } - - public T setSchRcptYmdFrom(String schRcptYmdFrom) { - this.schRcptYmdFrom = schRcptYmdFrom; - - return self(); - } - - public String getSchRcptYmdTo() { - return ifEmpty(schRcptYmdTo, () -> null); - } - - public T setSchRcptYmdTo(String schRcptYmdTo) { - this.schRcptYmdTo = schRcptYmdTo; - - return self(); - } - - public String getSchAnsYmdFrom() { - return ifEmpty(schAnsYmdFrom, () -> null); - } - - public T setSchAnsYmdFrom(String schAnsYmdFrom) { - this.schAnsYmdFrom = schAnsYmdFrom; - - return self(); - } - - public String getSchAnsYmdTo() { - return ifEmpty(schAnsYmdTo, () -> null); - } - - public T setSchAnsYmdTo(String schAnsYmdTo) { - this.schAnsYmdTo = schAnsYmdTo; - - return self(); - } - - public String getSchOpnnSbmsnSttsCd() { - return ifEmpty(schOpnnSbmsnSttsCd, () -> null); - } - - public T setSchOpnnSbmsnSttsCd(String schOpnnSbmsnSttsCd) { - this.schOpnnSbmsnSttsCd = schOpnnSbmsnSttsCd; - - return self(); - } - - public String getSchSttrNm() { - return ifEmpty(schSttrNm, () -> null); - } - - public T setSchSttrNm(String schSttrNm) { - this.schSttrNm = schSttrNm; - - return self(); - } - - public String getSchVhrno() { - return ifEmpty(schVhrno, () -> null); - } - - public T setSchVhrno(String schVhrno) { - this.schVhrno = schVhrno; - - return self(); - } - - public String getSchRtpyrNm() { - return ifEmpty(schRtpyrNm, () -> null); - } - - public T setSchRtpyrNm(String schRtpyrNm) { - this.schRtpyrNm = schRtpyrNm; - - 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 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(); - } - // 동적 검색 조건 /////////////////////////////////////////////////////////////// - - // ETC ///////////////////////////////////////////////////////////////////// - public String getDelRsn() { - return ifEmpty(delRsn, () -> null); - } - - public T setDelRsn(String delRsn) { - this.delRsn = delRsn; - - return self(); - } - - public String getCallPurpose() { - return ifEmpty(callPurpose, () -> null); - } - - public T setCallPurpose(String callPurpose) { - this.callPurpose = callPurpose; - - return self(); - } - // ETC ///////////////////////////////////////////////////////////////////// - -} diff --git a/src/main/java/cokr/xit/fims/excl/Excl03Query.java b/src/main/java/cokr/xit/fims/excl/Excl03Query.java deleted file mode 100644 index ede1dc7d..00000000 --- a/src/main/java/cokr/xit/fims/excl/Excl03Query.java +++ /dev/null @@ -1,261 +0,0 @@ -package cokr.xit.fims.excl; - -import cokr.xit.foundation.component.QueryRequest; - -/**부과제외 대장 정보 조회 요청 -* -*

상세 설명: -* -*

-* ============ 변경 이력 ============
-* 2023-06-23	JoJH 최초 작성
-* ================================
-* 
-*/ -public class Excl03Query extends QueryRequest { - - private static final long serialVersionUID = 1L; - - // 필수 조건 - private String sggCd; // 시군구 코드 - private String taskSeCd; // 업무 구분 코드 - private String delYn; // 삭제 여부 - // ID - private String[] reRegIDs; // 재등록 ID - private String reRegId; // 재등록 ID - private String crdnId; // 단속 ID - // 공통 조건 - private String schDateOpt; // 검색 일자 구분 - private String schDateFrom; // 검색 일자 시작 - private String schDateTo; // 검색 일자 종료 - private String schDetailUserOpt; // 상세 검색 사용자 구분 - private String schDetailUserNm; // 상세 검색 사용자 명 - private String schDetailUserCd; // 상세 검색 사용자 코드 - // 검색 조건 - private String schReRegYmdFrom; // 재등록 일자 시작 - private String schReRegYmdTo; // 재등록 일자 종료 - private String schVhrno; // 차량번호 - 단속(TB_CRDN) - private String schCrdnYmdFrom; // 단속 일자 시작 - 단속(TB_CRDN) - private String schCrdnYmdTo; // 단속 일자 종료 - 단속(TB_CRDN) - // 동적 검색 조건 - private String mainOption; - private String subOption; - // ETC - private String delRsn; // 삭제 사유 - private String callPurpose; // 호출용도 - - 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[] getReRegIDs() { - return ifEmpty(reRegIDs, () -> null); - } - - public T setReRegIDs(String... reRegIDs) { - this.reRegIDs = reRegIDs; - - return self(); - } - - public String getReRegId() { - return ifEmpty(reRegId, () -> null); - } - - public T setReRegId(String reRegId) { - this.reRegId = reRegId; - - return self(); - } - - public String getCrdnId() { - return ifEmpty(crdnId, () -> null); - } - - public T setCrdnId(String crdnId) { - this.crdnId = crdnId; - - 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 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 getSchReRegYmdFrom() { - return ifEmpty(schReRegYmdFrom, () -> null); - } - - public T setSchReRegYmdFrom(String schReRegYmdFrom) { - this.schReRegYmdFrom = schReRegYmdFrom; - - return self(); - } - - public String getSchReRegYmdTo() { - return ifEmpty(schReRegYmdTo, () -> null); - } - - public T setSchReRegYmdTo(String schReRegYmdTo) { - this.schReRegYmdTo = schReRegYmdTo; - - return self(); - } - - public String getSchVhrno() { - return ifEmpty(schVhrno, () -> null); - } - - public T setSchVhrno(String schVhrno) { - this.schVhrno = schVhrno; - - 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 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(); - } - // 동적 검색 조건 /////////////////////////////////////////////////////////////// - - // ETC ///////////////////////////////////////////////////////////////////// - public String getDelRsn() { - return ifEmpty(delRsn, () -> null); - } - - public T setDelRsn(String delRsn) { - this.delRsn = delRsn; - - return self(); - } - - public String getCallPurpose() { - return ifEmpty(callPurpose, () -> null); - } - - public T setCallPurpose(String callPurpose) { - this.callPurpose = callPurpose; - - return self(); - } - // ETC ///////////////////////////////////////////////////////////////////// - -} diff --git a/src/main/java/cokr/xit/fims/excl/Excl01Query.java b/src/main/java/cokr/xit/fims/excl/ExclQuery.java similarity index 50% rename from src/main/java/cokr/xit/fims/excl/Excl01Query.java rename to src/main/java/cokr/xit/fims/excl/ExclQuery.java index 577ad800..6b148e2e 100644 --- a/src/main/java/cokr/xit/fims/excl/Excl01Query.java +++ b/src/main/java/cokr/xit/fims/excl/ExclQuery.java @@ -12,7 +12,7 @@ import cokr.xit.foundation.component.QueryRequest; * ================================ * */ -public class Excl01Query extends QueryRequest { +public class ExclQuery extends QueryRequest { private static final long serialVersionUID = 1L; @@ -21,9 +21,14 @@ public class Excl01Query extends QueryRequest { private String taskSeCd; // 업무 구분 코드 private String delYn; // 삭제 여부 // ID - private String[] levyExclIDs; // 부과 제외 ID - private String levyExclId; // 부과 제외 ID private String crdnId; // 단속 ID + private String[] levyExclIDs; // 부과제외 IDs + private String levyExclId; // 부과제외 ID + private String[] opnnIDs; // 의견제출 ID + private String opnnId; // 의견제출 ID + private String[] reRegIDs; // 재등록 IDs + private String reRegId; // 재등록 ID + // 공통 조건 private String schDateOpt; // 검색 일자 구분 private String schDateFrom; // 검색 일자 시작 @@ -38,32 +43,40 @@ public class Excl01Query extends QueryRequest { private String schDetailUserNm; // 상세 검색 사용자 명 private String schDetailUserCd; // 상세 검색 사용자 코드 // 검색 조건 - private String schLevyExclYmdFrom; // 부과 제외 일자 시작 - private String schLevyExclYmdTo; // 부과 제외 일자 종료 - private String schLevyExclSeCd; // 부과 제외 구분 코드 - private String schVhrno; // 단속(TB_CRDN) - 차량번호 - private String schRtpyrNm; // 납부자(TB_PAYER) - 납부자 명 - private String schCrdnYmdFrom; // 단속 일자 시작 - private String schCrdnYmdTo; // 단속 일자 종료 + private String schLevyExclYmdFrom; // 부과제외_부과제외 일자 시작 + private String schLevyExclYmdTo; // 부과제외_부과제외 일자 종료 + private String schLevyExclSeCd; // 부과제외_부과제외 구분 코드 + private String schRcptYmdFrom; // 의견제출_접수 일자 시작 + private String schRcptYmdTo; // 의견제출_접수 일자 종료 + private String schAnsYmdFrom; // 의견제출_답변 일자 시작 + private String schAnsYmdTo; // 의견제출_답변 일자 종료 + private String schOpnnSbmsnSttsCd; // 의견제출_의견 제출 상태 코드 + private String schSttrNm; // 의견제출_진술자 명 + private String schReRegYmdFrom; // 단속재등록_재등록 일자 시작 + private String schReRegYmdTo; // 단속재등록_재등록 일자 종료 + private String schVhrno; // 단속(TB_CRDN)_차량번호 + private String schCrdnYmdFrom; // 단속(TB_CRDN)_단속 일자 시작 + 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) - 납부자 명 + 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 delRsn; // 삭제 사유 private String sndngRcvmtCd; // 발송 수납 코드 - private String callPurpose; // 호출용도 public String getSggCd() { return ifEmpty(sggCd, () -> null); } - public T setSggCd(String sggCd) { + public T setSggCd(String sggCd) { this.sggCd = sggCd; return self(); @@ -73,7 +86,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(taskSeCd, () -> null); } - public T setTaskSeCd(String taskSeCd) { + public T setTaskSeCd(String taskSeCd) { this.taskSeCd = taskSeCd; return self(); @@ -83,7 +96,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(delYn, () -> null); } - public T setDelYn(String delYn) { + public T setDelYn(String delYn) { this.delYn = delYn; return self(); @@ -93,7 +106,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(levyExclIDs, () -> null); } - public T setLevyExclIDs(String... levyExclIDs) { + public T setLevyExclIDs(String... levyExclIDs) { this.levyExclIDs = levyExclIDs; return self(); @@ -103,17 +116,57 @@ public class Excl01Query extends QueryRequest { return ifEmpty(levyExclId, () -> null); } - public T setLevyExclId(String levyExclId) { + public T setLevyExclId(String levyExclId) { this.levyExclId = levyExclId; return self(); } + public String[] getOpnnIDs() { + return ifEmpty(opnnIDs, () -> null); + } + + public T setOpnnIDs(String... opnnIDs) { + this.opnnIDs = opnnIDs; + + return self(); + } + + public String getOpnnId() { + return ifEmpty(opnnId, () -> null); + } + + public T setOpnnId(String opnnId) { + this.opnnId = opnnId; + + return self(); + } + + public String[] getReRegIDs() { + return ifEmpty(reRegIDs, () -> null); + } + + public T setReRegIDs(String... reRegIDs) { + this.reRegIDs = reRegIDs; + + return self(); + } + + public String getReRegId() { + return ifEmpty(reRegId, () -> null); + } + + public T setReRegId(String reRegId) { + this.reRegId = reRegId; + + return self(); + } + public String getCrdnId() { return ifEmpty(crdnId, () -> null); } - public T setCrdnId(String crdnId) { + public T setCrdnId(String crdnId) { this.crdnId = crdnId; return self(); @@ -123,7 +176,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDateOpt, () -> null); } - public T setSchDateOpt(String schDateOpt) { + public T setSchDateOpt(String schDateOpt) { this.schDateOpt = schDateOpt; return self(); @@ -133,7 +186,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDateFrom, () -> null); } - public T setSchDateFrom(String schDateFrom) { + public T setSchDateFrom(String schDateFrom) { this.schDateFrom = schDateFrom; return self(); @@ -143,7 +196,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDateTo, () -> null); } - public T setSchDateTo(String schDateTo) { + public T setSchDateTo(String schDateTo) { this.schDateTo = schDateTo; return self(); @@ -153,7 +206,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schRegDateOpt, () -> null); } - public T setSchRegDateOpt(String schRegDateOpt) { + public T setSchRegDateOpt(String schRegDateOpt) { this.schRegDateOpt = schRegDateOpt; return self(); @@ -163,7 +216,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schRegDateFrom, () -> null); } - public T setSchRegDateFrom(String schRegDateFrom) { + public T setSchRegDateFrom(String schRegDateFrom) { this.schRegDateFrom = schRegDateFrom; return self(); @@ -173,7 +226,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schRegDateTo, () -> null); } - public T setSchRegDateTo(String schRegDateTo) { + public T setSchRegDateTo(String schRegDateTo) { this.schRegDateTo = schRegDateTo; return self(); @@ -183,7 +236,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDetailDateOpt, () -> null); } - public T setSchDetailDateOpt(String schDetailDateOpt) { + public T setSchDetailDateOpt(String schDetailDateOpt) { this.schDetailDateOpt = schDetailDateOpt; return self(); @@ -193,7 +246,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDetailDateFrom, () -> null); } - public T setSchDetailDateFrom(String schDetailDateFrom) { + public T setSchDetailDateFrom(String schDetailDateFrom) { this.schDetailDateFrom = schDetailDateFrom; return self(); @@ -203,7 +256,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDetailDateTo, () -> null); } - public T setSchDetailDateTo(String schDetailDateTo) { + public T setSchDetailDateTo(String schDetailDateTo) { this.schDetailDateTo = schDetailDateTo; return self(); @@ -213,7 +266,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDetailUserOpt, () -> null); } - public T setSchDetailUserOpt(String schDetailUserOpt) { + public T setSchDetailUserOpt(String schDetailUserOpt) { this.schDetailUserOpt = schDetailUserOpt; return self(); @@ -223,7 +276,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDetailUserNm, () -> null); } - public T setSchDetailUserNm(String schDetailUserNm) { + public T setSchDetailUserNm(String schDetailUserNm) { this.schDetailUserNm = schDetailUserNm; return self(); @@ -233,7 +286,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schDetailUserCd, () -> null); } - public T setSchDetailUserCd(String schDetailUserCd) { + public T setSchDetailUserCd(String schDetailUserCd) { this.schDetailUserCd = schDetailUserCd; return self(); @@ -243,7 +296,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schLevyExclYmdFrom, () -> null); } - public T setSchLevyExclYmdFrom(String schLevyExclYmdFrom) { + public T setSchLevyExclYmdFrom(String schLevyExclYmdFrom) { this.schLevyExclYmdFrom = schLevyExclYmdFrom; return self(); @@ -253,7 +306,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schLevyExclYmdTo, () -> null); } - public T setSchLevyExclYmdTo(String schLevyExclYmdTo) { + public T setSchLevyExclYmdTo(String schLevyExclYmdTo) { this.schLevyExclYmdTo = schLevyExclYmdTo; return self(); @@ -263,17 +316,97 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schLevyExclSeCd, () -> null); } - public T setSchLevyExclSeCd(String schLevyExclSeCd) { + public T setSchLevyExclSeCd(String schLevyExclSeCd) { this.schLevyExclSeCd = schLevyExclSeCd; return self(); } + public String getSchRcptYmdFrom() { + return ifEmpty(schRcptYmdFrom, () -> null); + } + + public T setSchRcptYmdFrom(String schRcptYmdFrom) { + this.schRcptYmdFrom = schRcptYmdFrom; + + return self(); + } + + public String getSchRcptYmdTo() { + return ifEmpty(schRcptYmdTo, () -> null); + } + + public T setSchRcptYmdTo(String schRcptYmdTo) { + this.schRcptYmdTo = schRcptYmdTo; + + return self(); + } + + public String getSchAnsYmdFrom() { + return ifEmpty(schAnsYmdFrom, () -> null); + } + + public T setSchAnsYmdFrom(String schAnsYmdFrom) { + this.schAnsYmdFrom = schAnsYmdFrom; + + return self(); + } + + public String getSchAnsYmdTo() { + return ifEmpty(schAnsYmdTo, () -> null); + } + + public T setSchAnsYmdTo(String schAnsYmdTo) { + this.schAnsYmdTo = schAnsYmdTo; + + return self(); + } + + public String getSchOpnnSbmsnSttsCd() { + return ifEmpty(schOpnnSbmsnSttsCd, () -> null); + } + + public T setSchOpnnSbmsnSttsCd(String schOpnnSbmsnSttsCd) { + this.schOpnnSbmsnSttsCd = schOpnnSbmsnSttsCd; + + return self(); + } + + public String getSchSttrNm() { + return ifEmpty(schSttrNm, () -> null); + } + + public T setSchSttrNm(String schSttrNm) { + this.schSttrNm = schSttrNm; + + return self(); + } + + public String getSchReRegYmdFrom() { + return ifEmpty(schReRegYmdFrom, () -> null); + } + + public T setSchReRegYmdFrom(String schReRegYmdFrom) { + this.schReRegYmdFrom = schReRegYmdFrom; + + return self(); + } + + public String getSchReRegYmdTo() { + return ifEmpty(schReRegYmdTo, () -> null); + } + + public T setSchReRegYmdTo(String schReRegYmdTo) { + this.schReRegYmdTo = schReRegYmdTo; + + return self(); + } + public String getSchVhrno() { return ifEmpty(schVhrno, () -> null); } - public T setSchVhrno(String schVhrno) { + public T setSchVhrno(String schVhrno) { this.schVhrno = schVhrno; return self(); @@ -283,7 +416,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schRtpyrNm, () -> null); } - public T setSchRtpyrNm(String schRtpyrNm) { + public T setSchRtpyrNm(String schRtpyrNm) { this.schRtpyrNm = schRtpyrNm; return self(); @@ -293,7 +426,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schCrdnYmdFrom, () -> null); } - public T setSchCrdnYmdFrom(String schCrdnYmdFrom) { + public T setSchCrdnYmdFrom(String schCrdnYmdFrom) { this.schCrdnYmdFrom = schCrdnYmdFrom; return self(); @@ -303,7 +436,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(schCrdnYmdTo, () -> null); } - public T setSchCrdnYmdTo(String schCrdnYmdTo) { + public T setSchCrdnYmdTo(String schCrdnYmdTo) { this.schCrdnYmdTo = schCrdnYmdTo; return self(); @@ -314,7 +447,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(mainOption, () -> null); } - public T setMainOption(String mainOption) { + public T setMainOption(String mainOption) { this.mainOption = mainOption; return self(); @@ -324,7 +457,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(subOption, () -> null); } - public T setSubOption(String subOption) { + public T setSubOption(String subOption) { this.subOption = subOption; return self(); @@ -334,7 +467,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(grid, () -> null); } - public T setGrid(String grid) { + public T setGrid(String grid) { this.grid = grid; return self(); @@ -344,7 +477,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(levyExclSeNm, () -> null); } - public T setLevyExclSeNm(String levyExclSeNm) { + public T setLevyExclSeNm(String levyExclSeNm) { this.levyExclSeNm = levyExclSeNm; return self(); @@ -354,7 +487,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(vhrno, () -> null); } - public T setVhrno(String vhrno) { + public T setVhrno(String vhrno) { this.vhrno = vhrno; return self(); @@ -364,7 +497,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(rtpyrNm, () -> null); } - public T setRtpyrNm(String rtpyrNm) { + public T setRtpyrNm(String rtpyrNm) { this.rtpyrNm = rtpyrNm; return self(); @@ -374,7 +507,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(levyExclSeCd, () -> null); } - public T setLevyExclSeCd(String levyExclSeCd) { + public T setLevyExclSeCd(String levyExclSeCd) { this.levyExclSeCd = levyExclSeCd; return self(); @@ -386,7 +519,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(ansRsnCd, () -> null); } - public T setAnsRsnCd(String ansRsnCd) { + public T setAnsRsnCd(String ansRsnCd) { this.ansRsnCd = ansRsnCd; return self(); @@ -396,7 +529,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(delRsn, () -> null); } - public T setDelRsn(String delRsn) { + public T setDelRsn(String delRsn) { this.delRsn = delRsn; return self(); @@ -406,7 +539,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(sndngRcvmtCd, () -> null); } - public T setSndngRcvmtCd(String sndngRcvmtCd) { + public T setSndngRcvmtCd(String sndngRcvmtCd) { this.sndngRcvmtCd = sndngRcvmtCd; return self(); @@ -416,7 +549,7 @@ public class Excl01Query extends QueryRequest { return ifEmpty(callPurpose, () -> null); } - public T setCallPurpose(String callPurpose) { + public T setCallPurpose(String callPurpose) { this.callPurpose = callPurpose; return self(); diff --git a/src/main/java/cokr/xit/fims/excl/Excl01.java b/src/main/java/cokr/xit/fims/excl/LevyExcl.java similarity index 88% rename from src/main/java/cokr/xit/fims/excl/Excl01.java rename to src/main/java/cokr/xit/fims/excl/LevyExcl.java index a3f8e74d..085c7bcd 100644 --- a/src/main/java/cokr/xit/fims/excl/Excl01.java +++ b/src/main/java/cokr/xit/fims/excl/LevyExcl.java @@ -4,19 +4,13 @@ import cokr.xit.foundation.AbstractEntity; import lombok.Getter; import lombok.Setter; -/**부과제외 대장 -* -*

상세 설명: 부과제외 대장 엔티티를 데이터베이스에 저장하는 클래스다. -* -*

-* ============ 변경 이력 ============
-* 2023-06-23	JoJH 최초 작성
-* ================================
-* 
-*/ +/** + * 부과 제외 대장 + * @author JoJH + */ @Getter @Setter -public class Excl01 extends AbstractEntity { +public class LevyExcl extends AbstractEntity { /** * 부과 제외 ID diff --git a/src/main/java/cokr/xit/fims/excl/Excl02.java b/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java similarity index 89% rename from src/main/java/cokr/xit/fims/excl/Excl02.java rename to src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java index 5c321da4..aa04e709 100644 --- a/src/main/java/cokr/xit/fims/excl/Excl02.java +++ b/src/main/java/cokr/xit/fims/excl/OpnnSbmsn.java @@ -4,19 +4,13 @@ import cokr.xit.foundation.AbstractEntity; import lombok.Getter; import lombok.Setter; -/**의견제출 대장 -* -*

상세 설명: 의견제출 대장 엔티티를 데이터베이스에 저장하는 클래스다. -* -*

-* ============ 변경 이력 ============
-* 2023-06-23	JoJH 최초 작성
-* ================================
-* 
-*/ +/** + * 의견 제출 대장 + * @author JoJH + */ @Getter @Setter -public class Excl02 extends AbstractEntity { +public class OpnnSbmsn extends AbstractEntity { public static String INF_TYPE = "110"; // 의견 진술 첨부파일 diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java index ec5e1efe..237479f5 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/Excl01Mapper.java @@ -5,8 +5,8 @@ import java.util.Map; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.excl.Excl01; -import cokr.xit.fims.excl.Excl01Query; +import cokr.xit.fims.excl.LevyExcl; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -27,20 +27,20 @@ public interface Excl01Mapper extends AbstractMapper { * @param req 부과제외 대장 조회 조건 * @return 부과제외 대장 목록 */ - List selectLevyExclList(Excl01Query req); + List selectLevyExclList(ExclQuery req); /**지정한 조건에 따라 부과제외 대장 객체들을 반환한다. * @param req 부과제외 조회 조건 * @return 부과제외 대장 객체 목록 */ - List selectLevyExcls(Excl01Query req); + List selectLevyExcls(ExclQuery req); /**지정한 부과제외ID에 따라 부과제외 대장 객체를 반환한다. * @param levyExclId 부과제외 ID * @return 부과제외 대장 객체 */ default DataObject selectLevyExclInfo(String levyExclId) { - List levyExcl = selectLevyExcls(new Excl01Query().setLevyExclId(levyExclId)); + List levyExcl = selectLevyExcls(new ExclQuery().setLevyExclId(levyExclId)); return !levyExcl.isEmpty() ? levyExcl.get(0) : null; } @@ -61,7 +61,7 @@ public interface Excl01Mapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean insert(Excl01 excl01) { + default boolean insert(LevyExcl excl01) { return excl01 != null && insertLevyExcl(params().set("excl01", excl01)) == 1; } @@ -71,7 +71,7 @@ public interface Excl01Mapper extends AbstractMapper { */ int updateLevyExcl(Map params); - default boolean update(Excl01 excl01) { + default boolean update(LevyExcl excl01) { return excl01 != null && updateLevyExcl(params().set("excl01", excl01)) == 1; } @@ -84,7 +84,7 @@ public interface Excl01Mapper extends AbstractMapper { */ int deleteLevyExcl(Map params); - default boolean delete(Excl01 excl01) { + default boolean delete(LevyExcl excl01) { return excl01 != null && deleteLevyExcl(params().set("excl01", excl01)) >= 1; } @@ -92,10 +92,10 @@ public interface Excl01Mapper extends AbstractMapper { * @param crdnId 단속 ID * @return 단속, 부과제외 정보 */ - DataObject selectCrdn(Excl01Query req); + DataObject selectCrdn(ExclQuery req); default DataObject selectCrdnInfo(String crdnId) { - DataObject crdnInfo = selectCrdn(new Excl01Query().setCrdnId(crdnId)); + DataObject crdnInfo = selectCrdn(new ExclQuery().setCrdnId(crdnId)); return crdnInfo; } @@ -104,10 +104,10 @@ public interface Excl01Mapper extends AbstractMapper { * @param crdnId 단속 ID * @return 단속, 부과제외 정보 */ - DataObject selectCvlcptAnsWords(Excl01Query req); + DataObject selectCvlcptAnsWords(ExclQuery req); default DataObject selectCvlcptAnsWordsInfo(String ansRsnCd) { - DataObject cvlcptAnsWordsInfo = selectCvlcptAnsWords(new Excl01Query().setAnsRsnCd(ansRsnCd)); + DataObject cvlcptAnsWordsInfo = selectCvlcptAnsWords(new ExclQuery().setAnsRsnCd(ansRsnCd)); return cvlcptAnsWordsInfo; } @@ -118,7 +118,7 @@ public interface Excl01Mapper extends AbstractMapper { */ int updateCrdnCvlcptPrcs(Map params); - default boolean updateCrdnCvlcptPrcs(Excl01 excl01) { + default boolean updateCrdnCvlcptPrcs(LevyExcl excl01) { return excl01 != null && updateCrdnCvlcptPrcs(params().set("excl01", excl01)) == 1; } @@ -128,7 +128,7 @@ public interface Excl01Mapper extends AbstractMapper { */ int updateCvlcptPrcsRsltCn(Map params); - default boolean updateCvlcptPrcsRsltCn(Excl01 excl01) { + default boolean updateCvlcptPrcsRsltCn(LevyExcl excl01) { return excl01 != null && updateCvlcptPrcsRsltCn(params().set("excl01", excl01)) == 1; } @@ -138,7 +138,7 @@ public interface Excl01Mapper extends AbstractMapper { */ int updateCrdnCvlcpt(Map params); - default boolean updateCrdnCvlcpt(Excl01 excl01) { + default boolean updateCrdnCvlcpt(LevyExcl excl01) { return excl01 != null && updateCrdnCvlcpt(params().set("excl01", excl01)) == 1; } @@ -148,7 +148,7 @@ public interface Excl01Mapper extends AbstractMapper { */ int updateParkngPsbltyRsltCd(Map params); - default boolean updateParkngPsbltyRsltCd(Excl01 excl01) { + default boolean updateParkngPsbltyRsltCd(LevyExcl excl01) { return excl01 != null && updateParkngPsbltyRsltCd(params().set("excl01", excl01)) == 1; } @@ -156,10 +156,10 @@ public interface Excl01Mapper extends AbstractMapper { * @param crdnId 단속 ID * @return 단속, 부과제외 정보 */ - DataObject selectSndngDtl(Excl01Query req); + DataObject selectSndngDtl(ExclQuery req); default DataObject selectSndngDtlInfo(String crdnId, String sndngRcvmtCd) { - DataObject sndngDtlInfo = selectSndngDtl(new Excl01Query().setCrdnId(crdnId) + DataObject sndngDtlInfo = selectSndngDtl(new ExclQuery().setCrdnId(crdnId) .setSndngRcvmtCd(sndngRcvmtCd)); return sndngDtlInfo; @@ -171,7 +171,7 @@ public interface Excl01Mapper extends AbstractMapper { */ int updateRcvmtCd(Map params); - default boolean updateRcvmtCd(Excl01 excl01) { + default boolean updateRcvmtCd(LevyExcl excl01) { return excl01 != null && updateRcvmtCd(params().set("excl01", excl01)) >= 1; } diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java index cd428a9b..2949afc4 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/Excl02Mapper.java @@ -5,8 +5,8 @@ import java.util.Map; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.excl.Excl02; -import cokr.xit.fims.excl.Excl02Query; +import cokr.xit.fims.excl.OpnnSbmsn; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -27,20 +27,20 @@ public interface Excl02Mapper extends AbstractMapper { * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 목록 */ - List selectOpnnSbmsnList(Excl02Query req); + List selectOpnnSbmsnList(ExclQuery req); /**지정한 조건에 따라 의견제출 대장 객체들을 반환한다. * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 객체 목록 */ - List selectOpnnSbmsns(Excl02Query req); + List selectOpnnSbmsns(ExclQuery req); /**지정한 의견제출ID에 따라 의견제출 대장 객체를 반환한다. * @param opnnId 의견제출 ID * @return 의견제출 대장 객체 */ default DataObject selectOpnnSbmsnInfo(String opnnId) { - List opnnSbmsn = selectOpnnSbmsns(new Excl02Query().setOpnnId(opnnId)); + List opnnSbmsn = selectOpnnSbmsns(new ExclQuery().setOpnnId(opnnId)); return !opnnSbmsn.isEmpty() ? opnnSbmsn.get(0) : null; } @@ -49,10 +49,10 @@ public interface Excl02Mapper extends AbstractMapper { * @param crdnId 단속 ID * @return 단속, 부과제외 정보 */ - DataObject selectCrdn(Excl02Query req); + DataObject selectCrdn(ExclQuery req); default DataObject selectCrdnInfo(String crdnId) { - DataObject crdnInfo = selectCrdn(new Excl02Query().setCrdnId(crdnId)); + DataObject crdnInfo = selectCrdn(new ExclQuery().setCrdnId(crdnId)); return crdnInfo; } @@ -73,7 +73,7 @@ public interface Excl02Mapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean insert(Excl02 excl02) { + default boolean insert(OpnnSbmsn excl02) { return excl02 != null && insertOpnnSbmsn(params().set("excl02", excl02)) == 1; } @@ -93,7 +93,7 @@ public interface Excl02Mapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean update(Excl02 excl02) { + default boolean update(OpnnSbmsn excl02) { return excl02 != null && updateOpnnSbmsn(params().set("excl02", excl02)) == 1; } @@ -113,7 +113,7 @@ public interface Excl02Mapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean delete(Excl02 excl02) { + default boolean delete(OpnnSbmsn excl02) { return excl02 != null && deleteOpnnSbmsn(params().set("excl02", excl02)) == 1; } @@ -133,7 +133,7 @@ public interface Excl02Mapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean updateCrdn(Excl02 excl02) { + default boolean updateCrdn(OpnnSbmsn excl02) { return excl02 != null && updateOpnnSbmsnYn(params().set("excl02", excl02)) == 1; } @@ -153,7 +153,7 @@ public interface Excl02Mapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean updateOpnnSbmsnAnswer(Excl02 excl02) { + default boolean updateOpnnSbmsnAnswer(OpnnSbmsn excl02) { return excl02 != null && updateAnsSttsCd(params().set("excl02", excl02)) == 1; } diff --git a/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java b/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java index 81b82ec6..7d23c4df 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/Excl03Mapper.java @@ -5,8 +5,8 @@ import java.util.Map; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.excl.Excl03; -import cokr.xit.fims.excl.Excl03Query; +import cokr.xit.fims.excl.CrdnReReg; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; @@ -27,13 +27,13 @@ public interface Excl03Mapper extends AbstractMapper { * @param req 단속 재등록 조회 조건 * @return 단속 재등록 목록 */ - List selectCrdnReRegList(Excl03Query req); + List selectCrdnReRegList(ExclQuery req); /**지정한 조건에 따라 단속 재등록 객체들을 반환한다. * @param req 단속 재등록 조회 조건 * @return 단속 재등록 객체 목록 */ - List selectCrdnReRegs(Excl03Query req); + List selectCrdnReRegs(ExclQuery req); /**단속 재등록 정보를 등록한다. * @param params 파라미터 @@ -51,7 +51,7 @@ public interface Excl03Mapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean insert(Excl03 excl03) { + default boolean insert(CrdnReReg excl03) { return excl03 != null && insertCrdnReReg(params().set("excl03", excl03)) == 1; } @@ -71,7 +71,7 @@ public interface Excl03Mapper extends AbstractMapper { *
  • 그렇지 않으면 false
  • * */ - default boolean delete(Excl03 excl03) { + default boolean delete(CrdnReReg excl03) { return excl03 != null && deleteCrdnReReg(params().set("excl03", excl03)) == 1; } @@ -79,10 +79,10 @@ public interface Excl03Mapper extends AbstractMapper { * @param crdnId 단속ID * @return 단속 대장 정보 */ - DataObject selectCrdn(Excl03Query req); + DataObject selectCrdn(ExclQuery req); default DataObject selectCrdnInfo(String crdnId) { - return selectCrdn(new Excl03Query().setCrdnId(crdnId)); + return selectCrdn(new ExclQuery().setCrdnId(crdnId)); } } diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java b/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java index b8cb942e..2f68c7e5 100644 --- a/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java +++ b/src/main/java/cokr/xit/fims/excl/service/Excl01Service.java @@ -2,8 +2,8 @@ package cokr.xit.fims.excl.service; import java.util.List; -import cokr.xit.fims.excl.Excl01; -import cokr.xit.fims.excl.Excl01Query; +import cokr.xit.fims.excl.LevyExcl; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.foundation.data.DataObject; /**부과제외 대장 관리 서비스 인터페이스. @@ -22,13 +22,13 @@ public interface Excl01Service { * @param req 부과제외 대장 조회 조건 * @return 부과제외 대장 목록 */ - List getLevyExclList(Excl01Query req); + List getLevyExclList(ExclQuery req); /**지정한 부과제외 ID의 부과제외 정보를 반환한다.
    * @param levyExclId 부과 제외 ID * @return 부과제외 정보 */ - DataObject getLevyExclInfo(Excl01Query req); + DataObject getLevyExclInfo(ExclQuery req); /**부과제외 대장 정보를 등록한다. * @param excl 부과제외 대장 @@ -37,7 +37,7 @@ public interface Excl01Service { *
  • 그렇지 않으면 false
  • * */ - boolean createLevyExcl(Excl01 excl01); + boolean createLevyExcl(LevyExcl excl01); /**부과제외 대장 정보를 수정한다. * @param excl 부과제외 대장 @@ -46,7 +46,7 @@ public interface Excl01Service { *
  • 그렇지 않으면 false
  • * */ - boolean updateLevyExcl(Excl01 excl01); + boolean updateLevyExcl(LevyExcl excl01); /**부과제외 대장 정보를 삭제한다. * @param excl 부과제외 대장 @@ -55,7 +55,7 @@ public interface Excl01Service { *
  • 그렇지 않으면 false
  • * */ - boolean removeLevyExcl(Excl01 excl01); + boolean removeLevyExcl(LevyExcl excl01); /**부과제외 대장 정보를 삭제한다. * @param excl 부과제외 대장 @@ -64,6 +64,6 @@ public interface Excl01Service { *
  • 그렇지 않으면 false
  • * */ - boolean removeLevyExclList(Excl01Query req); + boolean removeLevyExclList(ExclQuery req); } diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java b/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java index b7cc286c..b84d649e 100644 --- a/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java +++ b/src/main/java/cokr/xit/fims/excl/service/Excl02Service.java @@ -3,8 +3,8 @@ package cokr.xit.fims.excl.service; import java.util.List; import cokr.xit.base.file.FileInfo; -import cokr.xit.fims.excl.Excl02; -import cokr.xit.fims.excl.Excl02Query; +import cokr.xit.fims.excl.OpnnSbmsn; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.foundation.data.DataObject; /**의견제출 대장 관리 서비스 인터페이스. @@ -23,19 +23,19 @@ public interface Excl02Service { * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 목록 */ - List getOpnnSbmsnList(Excl02Query req); + List getOpnnSbmsnList(ExclQuery req); /**지정한 조건에 따라 의견제출 대장 객체들을 반환한다. * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 객체 목록 */ - List getOpnnSbmsns(Excl02Query req); + List getOpnnSbmsns(ExclQuery req); /**지정한 ID의 의견제출 정보를 반환한다.
    * @param opnnId 의견제출 ID * @return 의견제출 정보 */ - DataObject getOpnnSbmsnInfo(Excl02Query req); + DataObject getOpnnSbmsnInfo(ExclQuery req); /**의견제출 대장 정보를 등록한다. * @param opnnSbmsn 의견제출 대장 @@ -44,7 +44,7 @@ public interface Excl02Service { *
  • 그렇지 않으면 false
  • * */ - boolean createOpnnSbmsn(Excl02 excl02, List fileInfoList); + boolean createOpnnSbmsn(OpnnSbmsn excl02, List fileInfoList); /**의견제출 대장 정보를 수정한다. * @param opnnSbmsn 의견제출 대장 @@ -53,7 +53,7 @@ public interface Excl02Service { *
  • 그렇지 않으면 false
  • * */ - boolean updateOpnnSbmsn(Excl02 excl02, List fileInfoList); + boolean updateOpnnSbmsn(OpnnSbmsn excl02, List fileInfoList); /**의견제출 대장 정보를 삭제한다. * @param opnnSbmsn 의견제출 대장 @@ -62,7 +62,7 @@ public interface Excl02Service { *
  • 그렇지 않으면 false
  • * */ - boolean removeOpnnSbmsn(Excl02 excl02); + boolean removeOpnnSbmsn(OpnnSbmsn excl02); /**부과제외 대장 정보를 삭제한다. * @param excl 부과제외 대장 @@ -71,7 +71,7 @@ public interface Excl02Service { *
  • 그렇지 않으면 false
  • * */ - boolean removeOpnnSbmsnList(Excl02Query req); + boolean removeOpnnSbmsnList(ExclQuery req); /**의견제출 대장 답변(상태) 정보를 수정한다. * @param opnnSbmsn 의견제출 대장 @@ -80,6 +80,6 @@ public interface Excl02Service { *
  • 그렇지 않으면 false
  • * */ - boolean updateOpnnSbmsnAnswer(Excl02 excl02); + boolean updateOpnnSbmsnAnswer(OpnnSbmsn excl02); } diff --git a/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java b/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java index 0d4abb90..9435618e 100644 --- a/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java +++ b/src/main/java/cokr/xit/fims/excl/service/Excl03Service.java @@ -2,8 +2,8 @@ package cokr.xit.fims.excl.service; import java.util.List; -import cokr.xit.fims.excl.Excl03; -import cokr.xit.fims.excl.Excl03Query; +import cokr.xit.fims.excl.CrdnReReg; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.foundation.data.DataObject; /**단속 재등록 관리 서비스 인터페이스. @@ -22,13 +22,13 @@ public interface Excl03Service { * @param req 단속 재등록 조회 조건 * @return 단속 재등록 목록 */ - List getCrackdownReRegistrationList(Excl03Query req); + List getCrackdownReRegistrationList(ExclQuery req); /**지정한 조건에 따라 단속 재등록 객체들을 반환한다. * @param req 단속 재등록 조회 조건 * @return 단속 재등록 객체 목록 */ - List getCrackdownReRegistrations(Excl03Query req); + List getCrackdownReRegistrations(ExclQuery req); /**단속 재등록 정보를 등록한다. * @param excl03 단속 재등록 @@ -37,7 +37,7 @@ public interface Excl03Service { *
  • 그렇지 않으면 false
  • * */ - boolean create(Excl03 excl03); + boolean create(CrdnReReg excl03); /**단속 재등록 정보를 삭제한다. * @param excl03 단속 재등록 @@ -46,5 +46,5 @@ public interface Excl03Service { *
  • 그렇지 않으면 false
  • * */ - boolean remove(Excl03 excl03); + boolean remove(CrdnReReg excl03); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java index b84c6dd4..46a076df 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01Bean.java @@ -1,14 +1,13 @@ package cokr.xit.fims.excl.service.bean; import java.util.List; -import java.util.Map; import javax.annotation.Resource; import org.springframework.stereotype.Component; -import cokr.xit.fims.excl.Excl01; -import cokr.xit.fims.excl.Excl01Query; +import cokr.xit.fims.excl.LevyExcl; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.dao.Excl01Mapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -34,7 +33,7 @@ public class Excl01Bean extends AbstractComponent { * @param req 부과제외 대장 조회 조건 * @return 부과제외 대장 목록 */ - public List getLevyExclList(Excl01Query req) { + public List getLevyExclList(ExclQuery req) { req.setOrderBy("LEVY_EXCL_ID"); // 정렬 return excl01Mapper.selectLevyExclList(req); @@ -44,7 +43,7 @@ public class Excl01Bean extends AbstractComponent { * @param levyExclId 부과제외 ID * @return 부과제외 정보 */ - public DataObject getLevyExclInfo(Excl01Query req) { + public DataObject getLevyExclInfo(ExclQuery req) { if (req.getLevyExclId() != null) { return excl01Mapper.selectLevyExclInfo(req.getLevyExclId()); // 수정(부과제외 조회) } else { @@ -65,7 +64,7 @@ public class Excl01Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean createLevyExcl(Excl01 excl01) { + public boolean createLevyExcl(LevyExcl excl01) { return excl01Mapper.insert(excl01); } @@ -76,7 +75,7 @@ public class Excl01Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateLevyExcl(Excl01 excl01) { + public boolean updateLevyExcl(LevyExcl excl01) { return excl01Mapper.update(excl01); } @@ -87,7 +86,7 @@ public class Excl01Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean removeLevyExcl(Excl01 excl01) { + public boolean removeLevyExcl(LevyExcl excl01) { return excl01Mapper.delete(excl01); } @@ -114,7 +113,7 @@ public class Excl01Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateCrdnCvlcptPrcs(Excl01 excl01) { + public boolean updateCrdnCvlcptPrcs(LevyExcl excl01) { return excl01Mapper.updateCrdnCvlcptPrcs(excl01); } @@ -125,7 +124,7 @@ public class Excl01Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateCvlcptPrcsRsltCn(Excl01 excl01) { + public boolean updateCvlcptPrcsRsltCn(LevyExcl excl01) { return excl01Mapper.updateCvlcptPrcsRsltCn(excl01); } @@ -136,7 +135,7 @@ public class Excl01Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateCrdnCvlcpt(Excl01 excl01) { + public boolean updateCrdnCvlcpt(LevyExcl excl01) { return excl01Mapper.updateCrdnCvlcpt(excl01); } @@ -147,7 +146,7 @@ public class Excl01Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateParkngPsbltyRsltCd(Excl01 excl01) { + public boolean updateParkngPsbltyRsltCd(LevyExcl excl01) { return excl01Mapper.updateParkngPsbltyRsltCd(excl01); } @@ -166,7 +165,7 @@ public class Excl01Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateRcvmtCd(Excl01 excl01) { + public boolean updateRcvmtCd(LevyExcl excl01) { return excl01Mapper.updateRcvmtCd(excl01); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java index 6033f10d..bff01712 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl01ServiceBean.java @@ -10,8 +10,8 @@ import org.springframework.stereotype.Service; import cokr.xit.fims.cmmn.CrdnSttsHstry; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; -import cokr.xit.fims.excl.Excl01; -import cokr.xit.fims.excl.Excl01Query; +import cokr.xit.fims.excl.LevyExcl; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.service.Excl01Service; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.component.AbstractServiceBean; @@ -39,17 +39,17 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv private CrdnSttsHstryBean crdnSttsHstryBean; @Override - public List getLevyExclList(Excl01Query req) { + public List getLevyExclList(ExclQuery req) { return excl01Bean.getLevyExclList(req); } @Override - public DataObject getLevyExclInfo(Excl01Query req) { + public DataObject getLevyExclInfo(ExclQuery req) { return excl01Bean.getLevyExclInfo(req); } @Override - public boolean createLevyExcl(Excl01 excl01) { + public boolean createLevyExcl(LevyExcl excl01) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 String newCrdnSttsCd = ""; // 신규 단속 상태 코드(CRDN_STTS_CD) @@ -119,7 +119,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv // 자동등록 자료만 단속민원(TB_CRDN_CVLCPT) 답변 부분을 처리 if (infoCrdnLevyExcl.string("CRDN_REG_SE_CD").equals("02")) { // 단속민원(TB_CRDN_CVLCPT) 대장 - Excl01 updtCrdnCvlcpt = new Excl01(); + LevyExcl updtCrdnCvlcpt = new LevyExcl(); updtCrdnCvlcpt.setCvlcptLinkId(infoCrdnLevyExcl.string("CVLCPT_LINK_ID")); // 민원 연계 ID @@ -178,7 +178,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv // 표지정보 확인여부가 미확인이면 -> 조회미대상 으로 if (infoCrdnLevyExcl.string("PARKNG_PSBLTY_RSLT_CD").equals("0")) { // 단속(TB_CRDN) 대장 - Excl01 updtCrdn = new Excl01(); + LevyExcl updtCrdn = new LevyExcl(); updtCrdn.setCrdnId(excl01.getCrdnId()); // 단속 ID updtCrdn.setParkngPsbltyRsltCd("9"); // 주차 가능 결과 코드 @@ -196,7 +196,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv if (infoSndngDtl != null) { // 발송 상세(TB_SNDNG_DTL) 대장 - Excl01 updtSndngDtl = new Excl01(); + LevyExcl updtSndngDtl = new LevyExcl(); updtSndngDtl.setCrdnId(excl01.getCrdnId()); // 단속 ID @@ -219,14 +219,14 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv } @Override - public boolean updateLevyExcl(Excl01 excl01) { + public boolean updateLevyExcl(LevyExcl excl01) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 String newCvlcptPrcsCd = ""; // 신규 민원 처리 코드(CVLCPT_PRCS_CD) String newCvlcptTrsmCd = ""; // 민원 전송 코드(CVLCPT_TRSM_CD) // 부과제외(TB_LEVY_EXCL) + 단속(TB_CRDN) 자료 조회 - DataObject infoCrdnLevyExcl = excl01Bean.getLevyExclInfo(new Excl01Query().setLevyExclId(excl01.getLevyExclId())); + DataObject infoCrdnLevyExcl = excl01Bean.getLevyExclInfo(new ExclQuery().setLevyExclId(excl01.getLevyExclId())); // 부과제외(TB_LEVY_EXCL) 대장을 수정 한다. retSuccess = excl01Bean.updateLevyExcl(excl01); @@ -240,7 +240,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv // 단속민원(TB_CRDN_CVLCPT)에 자료가 있는지 확인 if (!infoCrdnLevyExcl.string("CVLCPT_LINK_ID").equals("")) { // 단속 민원 대장 - Excl01 updtCrdnCvlcpt = new Excl01(); + LevyExcl updtCrdnCvlcpt = new LevyExcl(); updtCrdnCvlcpt.setCrdnId(infoCrdnLevyExcl.string("CRDN_ID")); // 단속 ID updtCrdnCvlcpt.setCvlcptLinkId(infoCrdnLevyExcl.string("CVLCPT_LINK_ID")); // 민원 연계 ID @@ -301,12 +301,12 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv } @Override - public boolean removeLevyExcl(Excl01 excl01) { + public boolean removeLevyExcl(LevyExcl excl01) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 // 부과제외(TB_LEVY_EXCL) + 단속(TB_CRDN) 자료 조회 - DataObject infoCrdnLevyExcl = excl01Bean.getLevyExclInfo(new Excl01Query().setLevyExclId(excl01.getLevyExclId())); + DataObject infoCrdnLevyExcl = excl01Bean.getLevyExclInfo(new ExclQuery().setLevyExclId(excl01.getLevyExclId())); // 단속 상태 코드(CRDN_STTS_CD) 확인.. if (infoCrdnLevyExcl.string("LEVY_EXCL_SE_CD").equals("1") && !infoCrdnLevyExcl.string("CRDN_STTS_CD").equals("81")) { // 비부과(서손) @@ -341,7 +341,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv // 비부과(서손) 취소하는데, 단속민원 전송상태가 전송대상(01) 또는 전송미대상(03), 전송요청(04) 자료이면 초기상태(전송대상)로 되돌린다 if (infoCrdnLevyExcl.string("CVLCPT_TRSM_CD").equals("01") || infoCrdnLevyExcl.string("CVLCPT_TRSM_CD").equals("03") || infoCrdnLevyExcl.string("CVLCPT_TRSM_CD").equals("04")) { - Excl01 updtCrdnCvlcpt = new Excl01(); + LevyExcl updtCrdnCvlcpt = new LevyExcl(); updtCrdnCvlcpt.setCvlcptLinkId(infoCrdnLevyExcl.string("CVLCPT_LINK_ID")); updtCrdnCvlcpt.setCvlcptPrcsCd("00"); // 민원 처리 코드 - 00 접수 @@ -361,7 +361,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv } @Override - public boolean removeLevyExclList(Excl01Query req) { + public boolean removeLevyExclList(ExclQuery req) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 @@ -372,7 +372,7 @@ public class Excl01ServiceBean extends AbstractServiceBean implements Excl01Serv // 부과제외IDs 만큼 반복.. for (int iLoop = 0; iLoop < req.getLevyExclIDs().length; iLoop++) { - Excl01 infoLevyExcl = new Excl01(); // 부과제외(TB_LEVY_EXCL) + LevyExcl infoLevyExcl = new LevyExcl(); // 부과제외(TB_LEVY_EXCL) infoLevyExcl.setLevyExclId(req.getLevyExclIDs()[iLoop]); // 부과제외 ID infoLevyExcl.setDelRsn(req.getDelRsn()); // 삭제 사유 diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java index a6d7f314..61ee4cf6 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02Bean.java @@ -6,8 +6,8 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; -import cokr.xit.fims.excl.Excl02; -import cokr.xit.fims.excl.Excl02Query; +import cokr.xit.fims.excl.OpnnSbmsn; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.dao.Excl02Mapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -33,7 +33,7 @@ public class Excl02Bean extends AbstractComponent { * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 목록 */ - public List getOpnnSbmsnList(Excl02Query req) { + public List getOpnnSbmsnList(ExclQuery req) { req.setOrderBy("OPNN_ID"); // 정렬 return excl02Mapper.selectOpnnSbmsnList(req); @@ -43,7 +43,7 @@ public class Excl02Bean extends AbstractComponent { * @param req 의견제출 대장 조회 조건 * @return 의견제출 대장 객체 목록 */ - public List getOpnnSbmsns(Excl02Query req) { + public List getOpnnSbmsns(ExclQuery req) { return excl02Mapper.selectOpnnSbmsns(req); } @@ -51,7 +51,7 @@ public class Excl02Bean extends AbstractComponent { * @param opnnId 의견제출 ID * @return 의견제출 정보 */ - public DataObject getOpnnSbmsnInfo(Excl02Query req) { + public DataObject getOpnnSbmsnInfo(ExclQuery req) { if (req.getOpnnId() != null) { return excl02Mapper.selectOpnnSbmsnInfo(req.getOpnnId()); // 의견ID로 의견제출 조회 } else { @@ -74,7 +74,7 @@ public class Excl02Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean createOpnnSbmsn(Excl02 excl02) { + public boolean createOpnnSbmsn(OpnnSbmsn excl02) { return excl02Mapper.insert(excl02); } @@ -85,7 +85,7 @@ public class Excl02Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateOpnnSbmsn(Excl02 excl02) { + public boolean updateOpnnSbmsn(OpnnSbmsn excl02) { return excl02Mapper.update(excl02); } @@ -96,7 +96,7 @@ public class Excl02Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean removeOpnnSbmsn(Excl02 excl02) { + public boolean removeOpnnSbmsn(OpnnSbmsn excl02) { return excl02Mapper.delete(excl02); } @@ -115,7 +115,7 @@ public class Excl02Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateCrdn(Excl02 excl02) { + public boolean updateCrdn(OpnnSbmsn excl02) { return excl02Mapper.updateCrdn(excl02); } @@ -126,7 +126,7 @@ public class Excl02Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean updateOpnnSbmsnAnswer(Excl02 excl02) { + public boolean updateOpnnSbmsnAnswer(OpnnSbmsn excl02) { return excl02Mapper.updateOpnnSbmsnAnswer(excl02); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java index bc5dc77a..6f1485f2 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl02ServiceBean.java @@ -11,8 +11,8 @@ import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.fims.cmmn.CrdnSttsHstry; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; -import cokr.xit.fims.excl.Excl02; -import cokr.xit.fims.excl.Excl02Query; +import cokr.xit.fims.excl.OpnnSbmsn; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.service.Excl02Service; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -43,17 +43,17 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv private CrdnSttsHstryBean crdnSttsHstryBean; @Override - public List getOpnnSbmsnList(Excl02Query req) { + public List getOpnnSbmsnList(ExclQuery req) { return excl02Bean.getOpnnSbmsnList(req); } @Override - public List getOpnnSbmsns(Excl02Query req) { + public List getOpnnSbmsns(ExclQuery req) { return excl02Bean.getOpnnSbmsns(req); } @Override - public DataObject getOpnnSbmsnInfo(Excl02Query req) { + public DataObject getOpnnSbmsnInfo(ExclQuery req) { DataObject opnnSbmsnInfo = excl02Bean.getOpnnSbmsnInfo(req); // 등록으로 실행했는데 의견제출 ID가 존재한다면 이미 등록되었으므로 오류로 처리.. @@ -66,7 +66,7 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv } @Override - public boolean createOpnnSbmsn(Excl02 excl02, List fileInfoList) { + public boolean createOpnnSbmsn(OpnnSbmsn excl02, List fileInfoList) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 @@ -90,7 +90,7 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv // 의견제출 파일 첨부하기 if (fileInfoList != null && !fileInfoList.isEmpty()) { - fileInfoList.forEach(fileInfo -> fileInfo.setInfoType(Excl02.INF_TYPE).setInfoKey(excl02.getOpnnId())); + fileInfoList.forEach(fileInfo -> fileInfo.setInfoType(OpnnSbmsn.INF_TYPE).setInfoKey(excl02.getOpnnId())); fileBean.create(fileInfoList); } @@ -116,7 +116,7 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv } // 단속 대장(TB_CRDN) 의견제출여부(OPNN_SBMSN_YN) 정보를 수정 한다. - Excl02 updtCrdn = new Excl02(); + OpnnSbmsn updtCrdn = new OpnnSbmsn(); updtCrdn.setCrdnId(infoCrdnOpnnSbmsn.string("CRDN_ID")); updtCrdn.setOpnnSbmsnYn("Y"); @@ -131,18 +131,18 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv } @Override - public boolean updateOpnnSbmsn(Excl02 excl02, List fileInfoList) { + public boolean updateOpnnSbmsn(OpnnSbmsn excl02, List fileInfoList) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 // 의견제출 첨부파일 등록 if (fileInfoList != null && !fileInfoList.isEmpty()) { - fileInfoList.forEach(fileInfo -> fileInfo.setInfoType(Excl02.INF_TYPE).setInfoKey(excl02.getOpnnId())); + fileInfoList.forEach(fileInfo -> fileInfo.setInfoType(OpnnSbmsn.INF_TYPE).setInfoKey(excl02.getOpnnId())); fileBean.create(fileInfoList); // 파일 등록 // 의견제출 ID로 파일(TB_FILE) 정보 조회 - List infoFileList = fileBean.getFileList(new FileQuery().setInfoType(Excl02.INF_TYPE).setInfoKeys(excl02.getOpnnId()).setOrderBy("FILE_ID")); + List infoFileList = fileBean.getFileList(new FileQuery().setInfoType(OpnnSbmsn.INF_TYPE).setInfoKeys(excl02.getOpnnId()).setOrderBy("FILE_ID")); if (infoFileList != null && infoFileList.size() > 0) { String[] fileIDs = new String[infoFileList.size()]; @@ -166,12 +166,12 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv } @Override - public boolean removeOpnnSbmsn(Excl02 excl02) { + public boolean removeOpnnSbmsn(OpnnSbmsn excl02) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 // 의견제출(TB_OPNN_SBMSN) + 단속(TB_CRDN) 자료 조회 - DataObject infoCrdnOpnnSbmsn = excl02Bean.getOpnnSbmsnInfo(new Excl02Query().setOpnnId(excl02.getOpnnId())); + DataObject infoCrdnOpnnSbmsn = excl02Bean.getOpnnSbmsnInfo(new ExclQuery().setOpnnId(excl02.getOpnnId())); // 단속 상태 코드가 의견진술 접수(31) 또는 의견진술 수용(82) 이라면... 이전 단속 상태 코드로 복원 한다. if (infoCrdnOpnnSbmsn.string("CRDN_STTS_CD").equals("31") || infoCrdnOpnnSbmsn.string("CRDN_STTS_CD").equals("82")) { @@ -186,7 +186,7 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv // 첨부파일 삭제 String[] deleteFiles = {excl02.getOpnnId()}; - fileBean.remove(Excl02.INF_TYPE, deleteFiles); + fileBean.remove(OpnnSbmsn.INF_TYPE, deleteFiles); // 의견제출(TB_OPNN_SBMSN) 대장을 삭제 한다. retSuccess = excl02Bean.removeOpnnSbmsn(excl02); @@ -196,7 +196,7 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv } // 단속 대장(TB_CRDN) 의견제출여부(OPNN_SBMSN_YN) 정보를 수정 한다. - Excl02 updtCrdn = new Excl02(); + OpnnSbmsn updtCrdn = new OpnnSbmsn(); updtCrdn.setCrdnId(infoCrdnOpnnSbmsn.string("CRDN_ID")); updtCrdn.setOpnnSbmsnYn("N"); @@ -211,7 +211,7 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv } @Override - public boolean removeOpnnSbmsnList(Excl02Query req) { + public boolean removeOpnnSbmsnList(ExclQuery req) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 @@ -222,7 +222,7 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv // 의견제출IDs 만큼 반복.. for (int iLoop = 0; iLoop < req.getOpnnIDs().length; iLoop++) { - Excl02 infoOpnnSbmsn = new Excl02(); + OpnnSbmsn infoOpnnSbmsn = new OpnnSbmsn(); infoOpnnSbmsn.setOpnnId(req.getOpnnIDs()[iLoop]); // 의견제출 ID infoOpnnSbmsn.setDelRsn(req.getDelRsn()); // 삭제 사유 @@ -238,13 +238,13 @@ public class Excl02ServiceBean extends AbstractServiceBean implements Excl02Serv } @Override - public boolean updateOpnnSbmsnAnswer(Excl02 excl02) { + public boolean updateOpnnSbmsnAnswer(OpnnSbmsn excl02) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 String newCrdnSttsCd = ""; // 신규 단속 상태 코드(CRDN_STTS_CD) // 의견제출(TB_OPNN_SBMSN) + 단속(TB_CRDN) 자료 조회 - DataObject infoCrdnOpnnSbmsn = excl02Bean.getOpnnSbmsnInfo(new Excl02Query().setOpnnId(excl02.getOpnnId())); + DataObject infoCrdnOpnnSbmsn = excl02Bean.getOpnnSbmsnInfo(new ExclQuery().setOpnnId(excl02.getOpnnId())); // 수납 또는 취소된 자료를 의견진술 수용할 수 없다 if (infoCrdnOpnnSbmsn.number("CRDN_STTS_CD").intValue() >= 71) { diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java index 496ba0d9..724874fd 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03Bean.java @@ -6,8 +6,8 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; -import cokr.xit.fims.excl.Excl03; -import cokr.xit.fims.excl.Excl03Query; +import cokr.xit.fims.excl.CrdnReReg; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.dao.Excl03Mapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.data.DataObject; @@ -33,7 +33,7 @@ public class Excl03Bean extends AbstractComponent { * @param req 단속 재등록 조회 조건 * @return 단속 재등록 목록 */ - public List getCrackdownReRegistrationList(Excl03Query req) { + public List getCrackdownReRegistrationList(ExclQuery req) { req.setOrderBy("RE_REG_ID"); // 정렬 return excl03Mapper.selectCrdnReRegList(req); @@ -43,7 +43,7 @@ public class Excl03Bean extends AbstractComponent { * @param req 단속 재등록 조회 조건 * @return 단속 재등록 객체 목록 */ - public List getCrackdownReRegistrations(Excl03Query req) { + public List getCrackdownReRegistrations(ExclQuery req) { return excl03Mapper.selectCrdnReRegs(req); } @@ -54,7 +54,7 @@ public class Excl03Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean create(Excl03 excl03) { + public boolean create(CrdnReReg excl03) { return excl03Mapper.insert(excl03); } @@ -65,7 +65,7 @@ public class Excl03Bean extends AbstractComponent { *
  • 그렇지 않으면 false
  • * */ - public boolean remove(Excl03 excl03) { + public boolean remove(CrdnReReg excl03) { return excl03Mapper.delete(excl03); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java index 37973548..df5c986b 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/Excl03ServiceBean.java @@ -14,8 +14,8 @@ import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.service.CrdnService; -import cokr.xit.fims.excl.Excl03; -import cokr.xit.fims.excl.Excl03Query; +import cokr.xit.fims.excl.CrdnReReg; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.service.Excl03Service; import cokr.xit.foundation.component.AbstractServiceBean; import cokr.xit.foundation.data.DataObject; @@ -46,24 +46,24 @@ public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Serv private CrdnService crdnService; @Override - public List getCrackdownReRegistrationList(Excl03Query req) { + public List getCrackdownReRegistrationList(ExclQuery req) { return excl03Bean.getCrackdownReRegistrationList(req); } @Override - public List getCrackdownReRegistrations(Excl03Query req) { + public List getCrackdownReRegistrations(ExclQuery req) { return excl03Bean.getCrackdownReRegistrations(req); } @Override - public boolean create(Excl03 excl03) { + public boolean create(CrdnReReg excl03) { // 변수 선언 boolean retSuccess = false; // DB 처리 결과 // 단속 ID로 단속(TB_CRDN) 정보 조회 DataObject infoCrdn = excl03Bean.getCrackdown(excl03.getBfrCrdnId()); // 단속 ID로 파일(TB_FILE) 정보 조회 - List infoCrdnFileList = fileBean.getFileList(new FileQuery().setInfoType(Excl03.INF_TYPE) + List infoCrdnFileList = fileBean.getFileList(new FileQuery().setInfoType(CrdnReReg.INF_TYPE) .setInfoKeys(excl03.getBfrCrdnId())); // 재등록 단속 정보(TB_CRDN) @@ -163,7 +163,7 @@ public class Excl03ServiceBean extends AbstractServiceBean implements Excl03Serv } @Override - public boolean remove(Excl03 excl03) { + public boolean remove(CrdnReReg excl03) { return excl03Bean.remove(excl03); } diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index adf11733..bb8d18cc 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -11,8 +11,8 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.excl.Excl01; -import cokr.xit.fims.excl.Excl01Query; +import cokr.xit.fims.excl.LevyExcl; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.service.Excl01Service; import cokr.xit.foundation.data.DataObject; @@ -33,7 +33,7 @@ public class Excl01Controller extends ApplicationController { protected Excl01Service excl01Service; /**부과제외 대장 관리 메인화면(excl/excl01/010-main)을 연다. - * 조건없는 {@link #getLevyExclList(Excl01Query) 부과제외 대장 조회 결과}를 포함시킨다. + * 조건없는 {@link #getLevyExclList(ExclQuery) 부과제외 대장 조회 결과}를 포함시킨다. * @return /excl/excl01/010-main */ public ModelAndView levyExclusionMain() { @@ -52,7 +52,7 @@ public class Excl01Controller extends ApplicationController { } /**부과제외 대장 목록을 조회하여 반환한다.
    - * {@link LevyExclService#getLevyExclList(Excl01Query)} 참고 + * {@link LevyExclService#getLevyExclList(ExclQuery)} 참고 * @param req 부과제외 대장 조회 조건 * @return jsonView *
     {
    @@ -63,21 +63,21 @@ public class Excl01Controller extends ApplicationController {
     	 * }
    */ @RequestMapping(name = "부과제외 대장 조회", value = "/010/list.do") - public ModelAndView getLevyExclList(Excl01Query req) { + public ModelAndView getLevyExclList(ExclQuery req) { List result = excl01Service.getLevyExclList(setFetchSize(req)); return setCollectionInfo(new ModelAndView("jsonView"), result, "levyExcl"); } /**지정한 ID의 부과제외 정보(info)를 반환한다. - * @param Excl01Query req + * @param ExclQuery req * @return fims/excl/excl01020-info 또는 jsonView *
    {
     	 *     "levyExclusionInfo": 부과제외 정보
     	 * }
    */ @RequestMapping(name = "부과제외 정보 조회", value = "/020/info.do") - public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, Excl01Query req) { + public ModelAndView getLevyExclInfo(String saveCallbackFuncName, String savedCallbackFuncName, ExclQuery req) { DataObject levyExclInfo = excl01Service.getLevyExclInfo(req); if (req.getLevyExclId() == null && !levyExclInfo.string("LEVY_EXCL_ID").equals("")) { @@ -116,7 +116,7 @@ public class Excl01Controller extends ApplicationController { * } */ @PostMapping(name = "부과제외 대장 등록", value = "/020/create.do") - public ModelAndView createLevyExcl(Excl01 excl01) { + public ModelAndView createLevyExcl(LevyExcl excl01) { boolean saved = excl01Service.createLevyExcl(excl01); return new ModelAndView("jsonView") @@ -131,7 +131,7 @@ public class Excl01Controller extends ApplicationController { * } */ @PostMapping(name = "부과제외 대장 수정", value = "/020/update.do") - public ModelAndView updateLevyExcl(Excl01 excl01) { + public ModelAndView updateLevyExcl(LevyExcl excl01) { boolean saved = excl01Service.updateLevyExcl(excl01); return new ModelAndView("jsonView") @@ -147,7 +147,7 @@ public class Excl01Controller extends ApplicationController { * } */ @PostMapping(name = "부과제외 대장 제거", value = "/010/remove.do") - public ModelAndView removeLevyExcl(Excl01 excl01) { + public ModelAndView removeLevyExcl(LevyExcl excl01) { boolean saved = excl01Service.removeLevyExcl(excl01); return new ModelAndView("jsonView") @@ -163,7 +163,7 @@ public class Excl01Controller extends ApplicationController { * } */ @PostMapping(name = "부과제외 대장 제거", value = "/010/removes.do") - public ModelAndView removeLevyExclList(Excl01Query req) { + public ModelAndView removeLevyExclList(ExclQuery req) { boolean saved = excl01Service.removeLevyExclList(req); return new ModelAndView("jsonView") diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index 5ca507e4..bd993fff 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -16,8 +16,8 @@ import cokr.xit.base.file.FileInfo; import cokr.xit.base.file.service.FileService; import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.excl.Excl02; -import cokr.xit.fims.excl.Excl02Query; +import cokr.xit.fims.excl.OpnnSbmsn; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.service.Excl02Service; import cokr.xit.foundation.data.DataObject; @@ -73,7 +73,7 @@ public class Excl02Controller extends ApplicationController { * } */ @RequestMapping(name = "의견제출 대장 조회", value = "/010/list.do") - public ModelAndView getOpnnSbmsnList(Excl02Query req) { + public ModelAndView getOpnnSbmsnList(ExclQuery req) { List result = excl02Service.getOpnnSbmsnList(setFetchSize(req)); return setCollectionInfo(new ModelAndView("jsonView"), result, "opnnSbmsn"); @@ -87,7 +87,7 @@ public class Excl02Controller extends ApplicationController { * } */ @RequestMapping(name = "의견제출 정보 조회", value = "/020/info.do") - public ModelAndView getOpnnSbmsnInfo(Excl02Query req) { + public ModelAndView getOpnnSbmsnInfo(ExclQuery req) { DataObject opnnSbmsnInfo = excl02Service.getOpnnSbmsnInfo(req); // 등록으로 실행했는데 의견제출 ID가 존재한다면 이미 등록되었으므로 오류로 처리.. @@ -125,7 +125,7 @@ public class Excl02Controller extends ApplicationController { * } */ @PostMapping(name="의견제출 대장 등록", value="/020/create.do") - public ModelAndView createOpnnSbmsn(Excl02 excl02, MultipartFile[] uploadFiles) { + public ModelAndView createOpnnSbmsn(OpnnSbmsn excl02, MultipartFile[] uploadFiles) { // 파일 List fileInfoList = new ArrayList(); @@ -147,7 +147,7 @@ public class Excl02Controller extends ApplicationController { * } */ @PostMapping(name="의견제출 대장 수정", value="/020/update.do") - public ModelAndView updateOpnnSbmsn(Excl02 excl02, MultipartFile[] uploadFiles) { + public ModelAndView updateOpnnSbmsn(OpnnSbmsn excl02, MultipartFile[] uploadFiles) { // 파일 List fileInfoList = new ArrayList(); @@ -170,7 +170,7 @@ public class Excl02Controller extends ApplicationController { * } */ @PostMapping(name="의견제출 대장 제거", value="/010/remove.do") - public ModelAndView removeOpnnSbmsn(Excl02 excl02) { + public ModelAndView removeOpnnSbmsn(OpnnSbmsn excl02) { boolean saved = excl02Service.removeOpnnSbmsn(excl02); return new ModelAndView("jsonView") @@ -186,7 +186,7 @@ public class Excl02Controller extends ApplicationController { * } */ @PostMapping(name="의견제출 대장 제거", value="/010/removes.do") - public ModelAndView removeOpnnSbmsnList(Excl02Query req) { + public ModelAndView removeOpnnSbmsnList(ExclQuery req) { boolean saved = excl02Service.removeOpnnSbmsnList(req); return new ModelAndView("jsonView") @@ -201,7 +201,7 @@ public class Excl02Controller extends ApplicationController { * } */ @RequestMapping(name = "의견제출 결과 처리 조회", value = "/030/info.do") - public ModelAndView getOpnnSbmsnSttsInfo(Excl02Query req) { + public ModelAndView getOpnnSbmsnSttsInfo(ExclQuery req) { DataObject opnnSbmsnInfo = excl02Service.getOpnnSbmsnInfo(req); boolean json = jsonResponse(); @@ -229,7 +229,7 @@ public class Excl02Controller extends ApplicationController { * } */ @PostMapping(name="의견제출 대장 답변 수정", value="/030/updateAnswer.do") - public ModelAndView updateOpnnSbmsnAnswer(Excl02 excl02) { + public ModelAndView updateOpnnSbmsnAnswer(OpnnSbmsn excl02) { boolean saved = excl02Service.updateOpnnSbmsnAnswer(excl02); return new ModelAndView("jsonView") diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java index a46f38b0..2586b719 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -11,8 +11,8 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.web.ApplicationController; -import cokr.xit.fims.excl.Excl03; -import cokr.xit.fims.excl.Excl03Query; +import cokr.xit.fims.excl.CrdnReReg; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.service.Excl03Service; /**단속 재등록 서비스의 웹 컨트롤러 @@ -61,7 +61,7 @@ public class Excl03Controller extends ApplicationController { * } */ @RequestMapping(name = "단속 재등록 리스트 조회", value = "/010/list.do") - public ModelAndView getCrackdownReRegistrationList(Excl03Query req) { + public ModelAndView getCrackdownReRegistrationList(ExclQuery req) { List result = excl03Service.getCrackdownReRegistrationList(setFetchSize(req)); return setCollectionInfo(new ModelAndView("jsonView"), result, "crdnReReg"); @@ -75,7 +75,7 @@ public class Excl03Controller extends ApplicationController { * } */ @PostMapping(name = "단속 재등록 등록", value = "/010/create.do") - public ModelAndView create(Excl03 excl03) { + public ModelAndView create(CrdnReReg excl03) { boolean saved = excl03Service.create(excl03); return new ModelAndView("jsonView") @@ -91,7 +91,7 @@ public class Excl03Controller extends ApplicationController { * } */ @PostMapping(name = "단속 재등록 제거", value = "/010/remove.do") - public ModelAndView remove(Excl03 excl03) { + public ModelAndView remove(CrdnReReg excl03) { boolean saved = excl03Service.remove(excl03); return new ModelAndView("jsonView") diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt02ServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt02ServiceBean.java index 4f4ea403..a648dee1 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt02ServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/Sprt02ServiceBean.java @@ -4,7 +4,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; -import cokr.xit.fims.excl.Excl02Query; +import cokr.xit.fims.excl.ExclQuery; import cokr.xit.fims.excl.service.bean.Excl02Bean; import cokr.xit.fims.sprt.service.Sprt02Service; import cokr.xit.foundation.component.AbstractServiceBean; @@ -36,7 +36,13 @@ public class Sprt02ServiceBean extends AbstractServiceBean implements Sprt02Serv @Override public DataObject getOpnnSbmsnInfo(String crdnId) { - return excl02Bean.getOpnnSbmsnInfo(new Excl02Query().setCallPurpose("select") + return excl02Bean.getOpnnSbmsnInfo(new ExclQuery().setCallPurpose("select") + .setCrdnId(crdnId)); + } + + @Override + public DataObject getSndngInfo(String crdnId) { + return excl02Bean.getOpnnSbmsnInfo(new ExclQuery().setCallPurpose("select") .setCrdnId(crdnId)); } diff --git a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml index 300d32dc..bd225126 100644 --- a/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/excl01-mapper.xml @@ -7,7 +7,7 @@ 2023-06-23 JoJH 최초 작성 ============================ --> - + diff --git a/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml index f994a63c..9707e4e5 100644 --- a/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/excl02-mapper.xml @@ -7,7 +7,7 @@ 2023-06-27 JoJH 최초 작성 ============================ --> - + diff --git a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml index 1ae52e32..4f31fb81 100644 --- a/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/excl03-mapper.xml @@ -7,7 +7,7 @@ 2023-07-03 JoJH 최초 작성 ============================ --> - +