diff --git a/src/main/java/cokr/xit/fims/rcvm/Rcvmt.java b/src/main/java/cokr/xit/fims/rcvm/Rcvmt.java index 296fd43e..1bec8a90 100644 --- a/src/main/java/cokr/xit/fims/rcvm/Rcvmt.java +++ b/src/main/java/cokr/xit/fims/rcvm/Rcvmt.java @@ -42,6 +42,11 @@ public class Rcvmt extends AbstractEntity { */ private String deptCd; + /** + * 특별회계 사업 코드 + */ + private String spclBizCd; + /** * 회계 연도 */ diff --git a/src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java b/src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java index 2a4b7526..3e8dbeae 100644 --- a/src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java +++ b/src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java @@ -36,10 +36,13 @@ public class RcvmtQuery extends CmmnQuery { // 동적 검색 조건 private String rcvmtInptSeCd; // 수납(TB_RCVMT)_수납 입력 구분 코드 private String rcvmtRtrcnYn; // 수납(TB_RCVMT)_수납 취소 여부 + private String spclBizCd; // 수납(TB_RCVMT)_특별회계 사업 코드 private String fyr; // 수납(TB_RCVMT)_회계연도 private String acntgSeCd; // 수납(TB_RCVMT)_회계 구분 코드 private String txitmCd; // 수납(TB_RCVMT)_세목 코드 + private String operItemCd; // 수납(TB_RCVMT)_운영 항목 코드 private String levyNo; // 수납(TB_RCVMT)_부과 번호 + private String inspyNo; // 수납(TB_RCVMT)_분납 번호 private String rcvmtSn; // 수납(TB_RCVMT)_수납 일련번호 private String pstmrkYmd; // 수납(TB_RCVMT)_소인 일자 private String acntgYmd; // 수납(TB_RCVMT)_회계 일자 @@ -209,6 +212,15 @@ public class RcvmtQuery extends CmmnQuery { return self(); } + public String getSpclBizCd() { + return ifEmpty(spclBizCd, () -> null); + } + + public T setSpclBizCd(String spclBizCd) { + this.spclBizCd = spclBizCd; + return self(); + } + public String getFyr() { return ifEmpty(fyr, () -> null); } @@ -236,6 +248,15 @@ public class RcvmtQuery extends CmmnQuery { return self(); } + public String getOperItemCd() { + return ifEmpty(operItemCd, () -> null); + } + + public T setOperItemCd(String operItemCd) { + this.operItemCd = operItemCd; + return self(); + } + public String getLevyNo() { return ifEmpty(levyNo, () -> null); } @@ -245,6 +266,15 @@ public class RcvmtQuery extends CmmnQuery { return self(); } + public String getInspyNo() { + return ifEmpty(inspyNo, () -> null); + } + + public T setInspyNo(String inspyNo) { + this.inspyNo = inspyNo; + return self(); + } + public String getRcvmtSn() { return ifEmpty(rcvmtSn, () -> null); } diff --git a/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java b/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java index 2cd166d4..a665bc00 100644 --- a/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java +++ b/src/main/java/cokr/xit/fims/rcvm/service/bean/RcvmtBean.java @@ -112,6 +112,7 @@ public class RcvmtBean extends AbstractComponent { String rcvmtSeCd = ""; // 수납 구분 코드(FIM041) rcvmt.setDeptCd(levyInfo.string("DEPT_CD")); // 부서 코드 + rcvmt.setSpclBizCd(levyInfo.string("SPCL_BIZ_CD")); // 특별회계 사업 코드 rcvmt.setLastPcptax(levyInfo.number("LAST_PCPTAX").intValue()); // 최종 본세 rcvmt.setLastAdamt(levyInfo.number("LAST_ADAMT").intValue()); // 최종 가산금 diff --git a/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java b/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java index f5150725..e5caf2c2 100644 --- a/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java +++ b/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java @@ -180,7 +180,7 @@ public class Rcvm01Controller extends ApplicationController { */ public ModelAndView getReceivingMoneyInfo(RcvmtQuery req) { // 수납 정보 조회 - DataObject rcvmtInfo = rcvmtService.getRcvmtInfo(req); + DataObject info = rcvmtService.getRcvmtInfo(req); boolean json = jsonResponse(); @@ -191,11 +191,11 @@ public class Rcvm01Controller extends ApplicationController { return mav .addObject("pageName", "rcvm01020") - .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 - .addObject("FIM041List", commonCodes.get("FIM041")) // 수납 구분 코드(RCVMT_SE_CD) - .addObject("FIM045List", commonCodes.get("FIM045")) // 납부 방법 구분 코드(PAY_MTHD_SE_CD) - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) - .addObject("rcvmtInfo", json ? rcvmtInfo : toJson(rcvmtInfo)) // 수납 정보 + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 + .addObject("FIM041List", commonCodes.get("FIM041")) // 수납 구분 코드(RCVMT_SE_CD) + .addObject("FIM045List", commonCodes.get("FIM045")) // 납부 방법 구분 코드(PAY_MTHD_SE_CD) + .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) + .addObject("rcvmtInfo", json ? info : toJson(info)) // 수납 정보 ; } diff --git a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml index 0b14b329..339edadb 100644 --- a/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rcvm/rcvmt-mapper.xml @@ -8,45 +8,46 @@ ============================ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,6 +56,7 @@ , R.TASK_SE_CD , R.RCVMT_INPT_SE_CD , R.DEPT_CD + , R.SPCL_BIZ_CD , R.FYR , R.ACNTG_SE_CD , R.TXITM_CD @@ -259,6 +261,7 @@ , R.TASK_SE_CD , R.RCVMT_INPT_SE_CD , R.DEPT_CD + , R.SPCL_BIZ_CD , R.FYR , R.ACNTG_SE_CD , R.TXITM_CD @@ -352,6 +355,7 @@ , LEVY_ID , RCVMT_INPT_SE_CD , DEPT_CD + , SPCL_BIZ_CD , FYR , ACNTG_SE_CD , TXITM_CD @@ -390,6 +394,7 @@ , #{rcvmt.levyId} , #{rcvmt.rcvmtInptSeCd} , #{rcvmt.deptCd} + , #{rcvmt.spclBizCd} , #{rcvmt.fyr} , #{rcvmt.acntgSeCd} , #{rcvmt.txitmCd} @@ -428,6 +433,7 @@ SET LEVY_ID = #{rcvmt.levyId} , RCVMT_INPT_SE_CD = #{rcvmt.rcvmtInptSeCd} , DEPT_CD = #{rcvmt.deptCd} + , SPCL_BIZ_CD = #{rcvmt.spclBizCd} , FYR = #{rcvmt.fyr} , ACNTG_SE_CD = #{rcvmt.acntgSeCd} , TXITM_CD = #{rcvmt.txitmCd} @@ -461,12 +467,12 @@ /* 수납 대장 삭제(rcvmtMapper.deleteRcvmt) */ UPDATE TB_RCVMT - SET DEL_YN = 'Y' - , DEL_DT = #{rcvmt.lastModified} - , DLTR = #{rcvmt.modifiedBy} - , DEL_RSN = #{rcvmt.delRsn} - WHERE RCVMT_ID = #{rcvmt.rcvmtId} - AND DEL_YN = 'N' + SET DEL_YN = 'Y' + , DEL_DT = #{rcvmt.lastModified} + , DLTR = #{rcvmt.modifiedBy} + , DEL_RSN = #{rcvmt.delRsn} + WHERE RCVMT_ID = #{rcvmt.rcvmtId} + AND DEL_YN = 'N'