diff --git a/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java b/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java index 23e29211..877a3cff 100644 --- a/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java +++ b/src/main/java/cokr/xit/fims/excl/LevyExclQuery.java @@ -60,198 +60,176 @@ public class LevyExclQuery extends CmmnQuery { return ifEmpty(crdnId, () -> null); } - public T setCrdnId(String crdnId) { + public void setCrdnId(String crdnId) { this.crdnId = crdnId; - return self(); } public String[] getLevyExclIds() { return ifEmpty(levyExclIds, () -> null); } - public T setLevyExclIds(String... levyExclIds) { + public void setLevyExclIds(String... levyExclIds) { this.levyExclIds = levyExclIds; - return self(); } public String getLevyExclId() { return ifEmpty(levyExclId, () -> null); } - public T setLevyExclId(String levyExclId) { + public void setLevyExclId(String levyExclId) { this.levyExclId = levyExclId; - return self(); } public String[] getOpnnIds() { return ifEmpty(opnnIds, () -> null); } - public T setOpnnIds(String... opnnIds) { + public void setOpnnIds(String... opnnIds) { this.opnnIds = opnnIds; - return self(); } public String getOpnnId() { return ifEmpty(opnnId, () -> null); } - public T setOpnnId(String opnnId) { + public void setOpnnId(String opnnId) { this.opnnId = opnnId; - return self(); } public String getMngId() { return ifEmpty(mngId, () -> null); } - public T setMngId(String mngId) { + public void setMngId(String mngId) { this.mngId = mngId; - return self(); } public String[] getReRegIds() { return ifEmpty(reRegIds, () -> null); } - public T setReRegIds(String... reRegIds) { + public void setReRegIds(String... reRegIds) { this.reRegIds = reRegIds; - return self(); } public String getReRegId() { return ifEmpty(reRegId, () -> null); } - public T setReRegId(String reRegId) { + public void setReRegId(String reRegId) { this.reRegId = reRegId; - return self(); } public String getSchLevyExclYmdFrom() { return ifEmpty(schLevyExclYmdFrom, () -> null); } - public T setSchLevyExclYmdFrom(String schLevyExclYmdFrom) { + public void setSchLevyExclYmdFrom(String schLevyExclYmdFrom) { this.schLevyExclYmdFrom = schLevyExclYmdFrom; - return self(); } public String getSchLevyExclYmdTo() { return ifEmpty(schLevyExclYmdTo, () -> null); } - public T setSchLevyExclYmdTo(String schLevyExclYmdTo) { + public void setSchLevyExclYmdTo(String schLevyExclYmdTo) { this.schLevyExclYmdTo = schLevyExclYmdTo; - return self(); } public String getSchLevyExclSeCd() { return ifEmpty(schLevyExclSeCd, () -> null); } - public T setSchLevyExclSeCd(String schLevyExclSeCd) { + public void setSchLevyExclSeCd(String schLevyExclSeCd) { this.schLevyExclSeCd = schLevyExclSeCd; - return self(); } public String getSchLevyExclRsnCd() { return ifEmpty(schLevyExclRsnCd, () -> null); } - public T setSchLevyExclRsnCd(String schLevyExclRsnCd) { + public void setSchLevyExclRsnCd(String schLevyExclRsnCd) { this.schLevyExclRsnCd = schLevyExclRsnCd; - return self(); } public String getSchRcptYmdFrom() { return ifEmpty(schRcptYmdFrom, () -> null); } - public T setSchRcptYmdFrom(String schRcptYmdFrom) { + public void setSchRcptYmdFrom(String schRcptYmdFrom) { this.schRcptYmdFrom = schRcptYmdFrom; - return self(); } public String getSchRcptYmdTo() { return ifEmpty(schRcptYmdTo, () -> null); } - public T setSchRcptYmdTo(String schRcptYmdTo) { + public void setSchRcptYmdTo(String schRcptYmdTo) { this.schRcptYmdTo = schRcptYmdTo; - return self(); } public String getSchAnsYmdFrom() { return ifEmpty(schAnsYmdFrom, () -> null); } - public T setSchAnsYmdFrom(String schAnsYmdFrom) { + public void setSchAnsYmdFrom(String schAnsYmdFrom) { this.schAnsYmdFrom = schAnsYmdFrom; - return self(); } public String getSchAnsYmdTo() { return ifEmpty(schAnsYmdTo, () -> null); } - public T setSchAnsYmdTo(String schAnsYmdTo) { + public void setSchAnsYmdTo(String schAnsYmdTo) { this.schAnsYmdTo = schAnsYmdTo; - return self(); } public String getSchOpnnSbmsnSttsCd() { return ifEmpty(schOpnnSbmsnSttsCd, () -> null); } - public T setSchOpnnSbmsnSttsCd(String schOpnnSbmsnSttsCd) { + public void setSchOpnnSbmsnSttsCd(String schOpnnSbmsnSttsCd) { this.schOpnnSbmsnSttsCd = schOpnnSbmsnSttsCd; - return self(); } public String getSchOpnnSbmsnSeCd() { return ifEmpty(schOpnnSbmsnSeCd, () -> null); } - public T setSchOpnnSbmsnSeCd(String schOpnnSbmsnSeCd) { + public void setSchOpnnSbmsnSeCd(String schOpnnSbmsnSeCd) { this.schOpnnSbmsnSeCd = schOpnnSbmsnSeCd; - return self(); } public String getSchNtfctnSeCd() { return ifEmpty(schNtfctnSeCd, () -> null); } - public T setSchNtfctnSeCd(String schNtfctnSeCd) { + public void setSchNtfctnSeCd(String schNtfctnSeCd) { this.schNtfctnSeCd = schNtfctnSeCd; - return self(); } public String getSchSttrNm() { return ifEmpty(schSttrNm, () -> null); } - public T setSchSttrNm(String schSttrNm) { + public void setSchSttrNm(String schSttrNm) { this.schSttrNm = schSttrNm; - return self(); } public String getSchReRegYmdFrom() { return ifEmpty(schReRegYmdFrom, () -> null); } - public T setSchReRegYmdFrom(String schReRegYmdFrom) { + public void setSchReRegYmdFrom(String schReRegYmdFrom) { this.schReRegYmdFrom = schReRegYmdFrom; - return self(); } public String getSchReRegYmdTo() { return ifEmpty(schReRegYmdTo, () -> null); } - public T setSchReRegYmdTo(String schReRegYmdTo) { + public void setSchReRegYmdTo(String schReRegYmdTo) { this.schReRegYmdTo = schReRegYmdTo; - return self(); } // 상세 검색 조건 /////////////////////////////////////////////////////////////// @@ -301,54 +279,48 @@ public class LevyExclQuery extends CmmnQuery { return ifEmpty(callPurpose, () -> null); } - public T setCallPurpose(String callPurpose) { + public void setCallPurpose(String callPurpose) { this.callPurpose = callPurpose; - return self(); } public String getDelRsn() { return ifEmpty(delRsn, () -> null); } - public T setDelRsn(String delRsn) { + public void setDelRsn(String delRsn) { this.delRsn = delRsn; - return self(); } public String getLevyExclSeCd() { return ifEmpty(levyExclSeCd, () -> null); } - public T setLevyExclSeCd(String levyExclSeCd) { + public void setLevyExclSeCd(String levyExclSeCd) { this.levyExclSeCd = levyExclSeCd; - return self(); } public String getAnsRsnCd() { return ifEmpty(ansRsnCd, () -> null); } - public T setAnsRsnCd(String ansRsnCd) { + public void setAnsRsnCd(String ansRsnCd) { this.ansRsnCd = ansRsnCd; - return self(); } public String getSndngRcvmtCd() { return ifEmpty(sndngRcvmtCd, () -> null); } - public T setSndngRcvmtCd(String sndngRcvmtCd) { + public void setSndngRcvmtCd(String sndngRcvmtCd) { this.sndngRcvmtCd = sndngRcvmtCd; - return self(); } public String getRtpyrNo() { return ifEmpty(rtpyrNo, () -> null); } - public T setRtpyrNo(String rtpyrNo) { + public void setRtpyrNo(String rtpyrNo) { this.rtpyrNo = rtpyrNo; - return self(); } // ETC ///////////////////////////////////////////////////////////////////// diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java index a994cde9..3b31d1d8 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java @@ -110,8 +110,10 @@ public class LevyExclBean extends AbstractBean { String rtnMsg = ""; // 처리 결과 메시지 // 단속 ID로 단속, 부과제외 정보 조회 - DataObject levyExclInfo = levyExclMapper.selectLevyExclInfo(new LevyExclQuery().setCrdnId(levyExcl.getCrdnId()) - .setDelYn("N")); + LevyExclQuery req = new LevyExclQuery(); + req.setCrdnId(levyExcl.getCrdnId()); + req.setDelYn("N"); + DataObject levyExclInfo = levyExclMapper.selectLevyExclInfo(req); // 등록 대상 자료 검증 if (!levyExclInfo.string("LEVY_EXCL_ID").equals("")) { // 부과제외 ID가 있다면 이미 부과제외 자료가 존재하므로 종료.. @@ -239,7 +241,10 @@ public class LevyExclBean extends AbstractBean { String rtnMsg = ""; // 처리 결과 메시지 // 부과제외(TB_LEVY_EXCL) 정보를 조회한다. - DataObject levyExclInfo = levyExclMapper.selectLevyExclInfo(new LevyExclQuery().setLevyExclId(levyExcl.getLevyExclId())); + LevyExclQuery req = new LevyExclQuery(); + req.setLevyExclId(levyExcl.getLevyExclId()); + req.setDelYn("N"); + DataObject levyExclInfo = levyExclMapper.selectLevyExclInfo(req); // 삭제 대상 자료 검증 if (levyExclInfo == null) { diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java index 8dd1322e..c908417a 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/OpnnSbmsnBean.java @@ -120,11 +120,14 @@ public class OpnnSbmsnBean extends AbstractBean { public String createOpnnSbmsn(OpnnSbmsn opnnSbmsn, List fileInfoList) { // 변수 선언 boolean rtnScs = false; - int rtnNocs = -1; // 처리 결과 건수 - String rtnMsg = ""; // 처리 결과 메시지 + int rtnNocs = -1; // 처리 결과 건수 + String rtnMsg = ""; // 처리 결과 메시지 // 단속 ID로 단속, 의견제출 정보 조회 - DataObject crdnOpnnSbmsnInfo = opnnSbmsnMapper.selectOpnnSbmsnInfo(new LevyExclQuery().setCrdnId(opnnSbmsn.getCrdnId())); + LevyExclQuery req = new LevyExclQuery(); + req.setCrdnId(opnnSbmsn.getCrdnId()); + req.setDelYn("N"); + DataObject crdnOpnnSbmsnInfo = opnnSbmsnMapper.selectOpnnSbmsnInfo(req); // 의견제출 ID가 있다면 이미 자료가 존재하므로 종료.. if (!crdnOpnnSbmsnInfo.string("OPNN_ID").equals("")) { @@ -141,7 +144,7 @@ public class OpnnSbmsnBean extends AbstractBean { } // 의견제출(TB_OPNN_SBMSN) 대장을 등록한다. - rtnNocs = opnnSbmsnMapper.insertOpnnSbmsn(opnnSbmsn); // 의견제출 등록 + rtnNocs = opnnSbmsnMapper.insertOpnnSbmsn(opnnSbmsn); // 의견제출 등록 if (rtnNocs != 1) { throw new RuntimeException("의견제출 대장 등록에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } @@ -234,9 +237,16 @@ public class OpnnSbmsnBean extends AbstractBean { String rtnMsg = ""; // 처리 결과 메시지 // 의견제출(TB_OPNN_SBMSN) 자료 조회 - DataObject opnnSbmsnInfo = opnnSbmsnMapper.selectOpnnSbmsnInfo(new LevyExclQuery().setOpnnId(opnnSbmsn.getOpnnId())); + LevyExclQuery req = new LevyExclQuery(); + req.setOpnnId(opnnSbmsn.getOpnnId()); + req.setDelYn("N"); + DataObject opnnSbmsnInfo = opnnSbmsnMapper.selectOpnnSbmsnInfo(req); + // 과태료 감경 대장(TB_RDCT) 자료 조회 - DataObject rdctInfo = rdctBean.getRdctInfo(new LevyQuery().setCrdnId(opnnSbmsn.getCrdnId())); + LevyQuery reqLevy = new LevyQuery(); + reqLevy.setCrdnId(opnnSbmsn.getCrdnId()); + reqLevy.setDelYn("N"); + DataObject rdctInfo = rdctBean.getRdctInfo(reqLevy); // 의견제출 ID가 조회되지 않았다면 종료.. if (opnnSbmsnInfo.string("OPNN_ID").equals("")) { @@ -376,7 +386,10 @@ public class OpnnSbmsnBean extends AbstractBean { String rtnMsg = ""; // 처리 결과 메시지 // 의견제출(TB_OPNN_SBMSN) 정보를 조회한다. - DataObject opnnSbmsnInfo = opnnSbmsnMapper.selectOpnnSbmsnInfo(new LevyExclQuery().setOpnnId(opnnSbmsn.getOpnnId())); + LevyExclQuery req = new LevyExclQuery(); + req.setOpnnId(opnnSbmsn.getOpnnId()); + req.setDelYn("N"); + DataObject opnnSbmsnInfo = opnnSbmsnMapper.selectOpnnSbmsnInfo(req); // 의견제출 ID가 조회되지 않았다면 종료.. if (opnnSbmsnInfo.string("OPNN_ID").equals("")) { diff --git a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java index d3b99c03..06bfcc31 100644 --- a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -32,7 +32,7 @@ public class SprtQuery extends CmmnQuery { private String rtpyrNm; // 납부자 명 private String fyr; // 회계연도 private String levyNo; // 부과 번호 - private String unusedInq; // 미사용 조회 여부 + private String unusedInq; // 미사용 조회 여부 // ETC private String callPurpose; // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회). private String delRsn; // 삭제 사유 @@ -74,7 +74,6 @@ public class SprtQuery extends CmmnQuery { return self(); } - public String getRtpyrId() { return ifEmpty(rtpyrId, () -> null); } @@ -169,9 +168,8 @@ public class SprtQuery extends CmmnQuery { return ifEmpty(rtpyrNo, () -> null); } - public T setRtpyrNo(String rtpyrNo) { + public void setRtpyrNo(String rtpyrNo) { this.rtpyrNo = rtpyrNo; - return self(); } public String getRtpyrBrdt() { diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index 9153eb3c..fc046f86 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -176,10 +176,10 @@ public class Sprt02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02030-info"); // 의견 제출(TB_OPNN_SBMSN) 대장 조회 - DataObject opnnInfo = opnnSbmsnService.getOpnnSbmsnInfo( - new LevyExclQuery().setCrdnId(req.getCrdnId()) - .setDelYn("N") - ); + LevyExclQuery reqLevyExcl = new LevyExclQuery(); + reqLevyExcl.setCrdnId(req.getCrdnId()); + reqLevyExcl.setDelYn("N"); + DataObject opnnInfo = opnnSbmsnService.getOpnnSbmsnInfo(reqLevyExcl); // 재 조회로 호출되었다면.. if (req.getCallPurpose().equals("refresh")) {