From f6049584f6427e87ca7638c4cd2abd4cebd3f2c7 Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 15 Jul 2024 16:13:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BB=AC=EB=9F=BC=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD.=20inspyNo=20->=20ispySn;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java | 12 ++++++------ .../cokr/xit/fims/cmmn/pdf/print/format/Nht.java | 14 +++++++------- .../cokr/xit/fims/levy/web/Levy01Controller.java | 2 +- src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java | 10 +++++----- .../WEB-INF/jsp/fims/levy/levy01050-main.jsp | 4 ++-- .../WEB-INF/jsp/fims/sprt/sprt02070-info.jsp | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java b/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java index ea0db5d3..e8f43843 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java @@ -464,7 +464,7 @@ public class CmmnUtil { return retCode; } - public static String getOcrband1(String deptCode, String spclBizCd, String fyr, String acntgSeCd, String txitmCd, String levyNo, String inspyNo) { + public static String getOcrband1(String deptCode, String spclBizCd, String fyr, String acntgSeCd, String txitmCd, String levyNo, String ispySn) { if(deptCode.equals("")) { deptCode = "0000000"; } @@ -483,10 +483,10 @@ public class CmmnUtil { if(levyNo.equals("")) { levyNo = "000000"; } - if(inspyNo.equals("")) { - inspyNo = "00"; + if(ispySn.equals("")) { + ispySn = "00"; } - String band1 = deptCode + spclBizCd + fyr + acntgSeCd + txitmCd + levyNo + inspyNo; + String band1 = deptCode + spclBizCd + fyr + acntgSeCd + txitmCd + levyNo + ispySn; String ocrVrfcCode = getOcrVrfcCode("12357", band1, 31); band1 = band1 + ocrVrfcCode; @@ -561,8 +561,8 @@ public class CmmnUtil { String acntgSeCd = dataObject.string("ACNTG_SE_CD"); String txitmCd = dataObject.string("TXITM_CD"); String levyNo = dataObject.string("LEVY_NO"); - String inspyNo = dataObject.string("INSPY_NO"); - String ocr0 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); + String ispySn = dataObject.string("ISPY_SN"); + String ocr0 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, ispySn); dataObject.set("OCR0", ocr0); dataObject.set("OCR0_1", ocr0.substring(0, 17)); diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java index 259f297a..70858fee 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java @@ -243,8 +243,8 @@ public class Nht extends PDFPrintFormat { String acntgSeCd = dataObject.string("ACNTG_SE_CD"); String txitmCd = dataObject.string("TXITM_CD"); String levyNo = dataObject.string("LEVY_NO"); - String inspyNo = dataObject.string("INSPY_NO"); - result = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); + String ispySn = dataObject.string("ISPY_SN"); + result = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, ispySn); } case "ocr2" -> { String deptCode = dataObject.string("DEPT_CD"); @@ -253,8 +253,8 @@ public class Nht extends PDFPrintFormat { String acntgSeCd = dataObject.string("ACNTG_SE_CD"); String txitmCd = dataObject.string("TXITM_CD"); String levyNo = dataObject.string("LEVY_NO"); - String inspyNo = dataObject.string("INSPY_NO"); - String ocrBand1 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); + String ispySn = dataObject.string("ISPY_SN"); + String ocrBand1 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, ispySn); String levySeCd = dataObject.string("LEVY_SE_CD"); int sumAmt = dataObject.number("SUM_AMT").intValue(); // 합계 금액 @@ -268,8 +268,8 @@ public class Nht extends PDFPrintFormat { String acntgSeCd = dataObject.string("ACNTG_SE_CD"); String txitmCd = dataObject.string("TXITM_CD"); String levyNo = dataObject.string("LEVY_NO"); - String inspyNo = dataObject.string("INSPY_NO"); - String ocrBand1 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); + String ispySn = dataObject.string("ISPY_SN"); + String ocrBand1 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, ispySn); String levySeCd = dataObject.string("LEVY_SE_CD"); int sumAmt = dataObject.number("SUM_AMT").intValue(); // 합계 금액 @@ -423,7 +423,7 @@ public class Nht extends PDFPrintFormat { dataObject.put("ACNTG_SE_CD", "61"); dataObject.put("TXITM_CD", "234006"); dataObject.put("LEVY_NO", "123456"); - dataObject.put("INSPY_NO", "00"); + dataObject.put("ISPY_SN", "00"); dataObject.put("LEVY_SE_CD", "01"); dataObject.put("PCPTAX", "80000"); //본세 diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java index 9d128ae2..f2c9a958 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java @@ -284,7 +284,7 @@ public class Levy01Controller extends ApplicationController { valueMap.put("세목코드", format.of("TXITM_CD").style(center)); valueMap.put("세목명", format.of("TXITM_NM").style(center)); valueMap.put("부과번호", format.of("LEVY_NO").style(center)); - valueMap.put("분납순번", format.of("INSPY_NO").style(center)); + valueMap.put("분납순번", format.of("ISPY_SN").style(center)); valueMap.put("부과구분", format.of("LEVY_SE_NM").style(center)); valueMap.put("통합구분", format.of("UNTY_SE_NM").style(center)); valueMap.put("감경구분", format.of("RDCT_SE_NM").style(center)); diff --git a/src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java b/src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java index a7ea8526..ddcbd598 100644 --- a/src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java +++ b/src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java @@ -47,7 +47,7 @@ public class RcvmtQuery extends CmmnQuery { private String txitmCd; // 수납(TB_RCVMT)_세목 코드 private String operItemCd; // 수납(TB_RCVMT)_운영 항목 코드 private String levyNo; // 수납(TB_RCVMT)_부과 번호 - private String inspyNo; // 수납(TB_RCVMT)_분납 번호 + private String ispySn; // 수납(TB_RCVMT)_분납 번호 private String rcvmtSn; // 수납(TB_RCVMT)_수납 일련번호 private String tsfYmd; // 수납(TB_RCVMT)_이체 일자 private String acntgYmd; // 수납(TB_RCVMT)_회계 일자 @@ -315,12 +315,12 @@ public class RcvmtQuery extends CmmnQuery { return self(); } - public String getInspyNo() { - return ifEmpty(inspyNo, () -> null); + public String getIspySn() { + return ifEmpty(ispySn, () -> null); } - public T setInspyNo(String inspyNo) { - this.inspyNo = inspyNo; + public T setIspySn(String ispySn) { + this.ispySn = ispySn; return self(); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp index bd8f9f08..fdf0486e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp @@ -230,8 +230,8 @@ 대체압류차량 압류해제일자 전자납부번호 - 은행명1 - 가상계좌번호1 + 은행명 + 가상계좌번호 단속일시 차량번호 법정동 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp index c3f4f706..8172f6a6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp @@ -133,7 +133,7 @@
- +