diff --git a/src/main/java/cokr/xit/fims/cmmn/pdf/format/Nht.java b/src/main/java/cokr/xit/fims/cmmn/pdf/format/Nht.java index bd141441..b9eb2a77 100644 --- a/src/main/java/cokr/xit/fims/cmmn/pdf/format/Nht.java +++ b/src/main/java/cokr/xit/fims/cmmn/pdf/format/Nht.java @@ -56,8 +56,14 @@ public class Nht extends PDFFormat { text("crdnSn","증거번호",""), text("ffnlgCrdnAmt","최초금액",""), - text("advntceAmt","사전통지금액",""), - text("advntceDudtYmd","납부기한",""), + text("pcptax","본세",""), + text("adamt","가산금",""), + text("sumAmt","납기금액",""), + text("dudtYmd","납기일자",""), + text("dudtAftrPcptax","납기후본세",""), + text("dudtAftrAdamt","납기후가산금",""), + text("dudtAftrAmt","납기후금액",""), + text("dudtAftrYmd","납기후일자",""), text("vrActno","대표가상계좌번호",""), text("vrActno1","가상계좌번호1",""), @@ -153,11 +159,30 @@ public class Nht extends PDFFormat { case "ffnlgCrdnAmt" -> { result = dataObject.string("FFNLG_CRDN_AMT"); } - case "advntceAmt" -> { - result = CmmnUtil.addCommaToNumber(dataObject.string("ADVNTCE_AMT")); + + case "pcptax" -> { //본세 + result = dataObject.string("PCPTAX"); + } + case "adamt" -> { //가산금 + result = dataObject.string("ADAMT"); + } + case "sumAmt" -> { //납기금액 + result = dataObject.string("SUM_AMT"); + } + case "dudtYmd" -> { //납기일자 + result = dataObject.string("DUDT_YMD"); } - case "advntceDudtYmd" -> { - result = DataFormat.yyyy_mm_dd(dataObject.string("ADVNTCE_DUDT_YMD")); + case "dudtAftrPcptax" -> { //납기후본세 + result = dataObject.string("PCPTAX"); + } + case "dudtAftrAdamt" -> { //납기후가산금 + result = (dataObject.number("DUDT_AFTR_AMT").intValue() - dataObject.number("PCPTAX").intValue())+""; + } + case "dudtAftrAmt" -> { //납기후금액 + result = dataObject.string("DUDT_AFTR_AMT"); + } + case "dudtAftrYmd" -> { //납기후일자 + result = dataObject.string("DUDT_AFTR_YMD"); } case "vrActno" -> { @@ -383,9 +408,13 @@ public class Nht extends PDFFormat { dataObject.put("LEVY_NO", "123456"); dataObject.put("INSPY_SN", "00"); dataObject.put("LEVY_SE_CD", "01"); - dataObject.put("SUM_AMT", "80000"); - dataObject.put("DUDT_YMD", "20231215"); - dataObject.put("DUDT_AFTR_AMT", "20231231"); + + dataObject.put("PCPTAX", "80000"); //본세 + dataObject.put("ADAMT", "0"); //가산금 + dataObject.put("SUM_AMT", "80000"); //합계금액 + dataObject.put("DUDT_YMD", "20231215"); //납기일자 + dataObject.put("DUDT_AFTR_AMT", "100000"); //납기후 금액 + dataObject.put("DUDT_AFTR_YMD", "20231231"); //납기후 일자 dataObject.put("CRDN_PHOTO1", "samplefiles/crdn1.png"); dataObject.put("CRDN_PHOTO2", "samplefiles/crdn2.png");