diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java b/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java index e84bc207..601d9c58 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java @@ -362,7 +362,7 @@ public class CmmnUtil { return convert; } - public static String getOcrband1(String deptCode, String fyr, String acntgSeCd, String txitmCd, String levyNo, String inspySn) { + public static String getOcrband1(String deptCode, String fyr, String acntgSeCd, String txitmCd, String levyNo, String inspyNo) { if(deptCode.equals("")) { deptCode = "0000000"; } @@ -378,10 +378,10 @@ public class CmmnUtil { if(levyNo.equals("")) { levyNo = "000000"; } - if(inspySn.equals("")) { - inspySn = "00"; + if(inspyNo.equals("")) { + inspyNo = "00"; } - String band1 = deptCode + "0000" + fyr + acntgSeCd + txitmCd + levyNo + inspySn; + String band1 = deptCode + "0000" + fyr + acntgSeCd + txitmCd + levyNo + inspyNo; String ocrVrfcCode = SndngBean.getOcrVrfcCode("12357", band1, 31); band1 = band1+ocrVrfcCode; 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 ae9f4bec..954a736f 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 @@ -231,8 +231,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 inspySn = dataObject.string("INSPY_SN"); - result = CmmnUtil.getOcrband1(deptCode,fyr, acntgSeCd, txitmCd, levyNo, inspySn); + String inspyNo = dataObject.string("INSPY_NO"); + result = CmmnUtil.getOcrband1(deptCode,fyr, acntgSeCd, txitmCd, levyNo, inspyNo); } case "ocr2" -> { String deptCode = dataObject.string("DEPT_CD"); @@ -240,8 +240,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 inspySn = dataObject.string("INSPY_SN"); - String ocrBand1 = CmmnUtil.getOcrband1(deptCode, fyr, acntgSeCd, txitmCd, levyNo, inspySn); + String inspyNo = dataObject.string("INSPY_NO"); + String ocrBand1 = CmmnUtil.getOcrband1(deptCode, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); String levySeCd = dataObject.string("LEVY_SE_CD"); int sumAmt = dataObject.number("SUM_AMT").intValue(); // 합계 금액 @@ -254,8 +254,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 inspySn = dataObject.string("INSPY_SN"); - String ocrBand1 = CmmnUtil.getOcrband1(deptCode, fyr, acntgSeCd, txitmCd, levyNo, inspySn); + String inspyNo = dataObject.string("INSPY_NO"); + String ocrBand1 = CmmnUtil.getOcrband1(deptCode, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); String levySeCd = dataObject.string("LEVY_SE_CD"); int sumAmt = dataObject.number("SUM_AMT").intValue(); // 합계 금액 @@ -404,11 +404,12 @@ public class Nht extends PDFPrintFormat { dataObject.put("ADVNTCE_DUDT_YMD", "20231231"); dataObject.put("DEPT_CD", "4060411"); + dataObject.put("SPCL_BIZ_CD", "0000"); dataObject.put("FYR", "2023"); dataObject.put("ACNTG_SE_CD", "61"); dataObject.put("TXITM_CD", "234006"); dataObject.put("LEVY_NO", "123456"); - dataObject.put("INSPY_SN", "00"); + dataObject.put("INSPY_NO", "00"); dataObject.put("LEVY_SE_CD", "01"); dataObject.put("PCPTAX", "80000"); //본세 diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml index 8a991baf..f0b60a87 100644 --- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml @@ -80,7 +80,7 @@ , L.ACNTG_SE_CD /* 회계 구분 */ , L.TXITM_CD /* 세목 코드 */ , L.LEVY_NO /* 부과 번호 */ - , L.INSPY_SN /* 분납 순번 */ + , L.INSPY_NO /* 분납 번호 */ , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO /* 고지번호 */ , L.LEVY_SE_CD /* 부과 구분 코드 */ , (SELECT GET_CODE_NM('FIM040', L.LEVY_SE_CD) FROM DUAL) AS LEVY_SE_NM /* 부과 구분 명 */