xit-app
/
sgg-setting
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://xit.xit-git.com:3000/xit-app/fims

Browse Source
main
이범준 4 months ago
parent 763fef7af8 f6049584f6
commit b8b2bb024c
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/cokr/xit/fims/cmmn/CmmnUtil.java
Unescape Escape View File

@ -464,7 +464,7 @@ public class CmmnUtil {
return retCode; 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("")) { if(deptCode.equals("")) {
deptCode = "0000000"; deptCode = "0000000";
} }
@ -483,10 +483,10 @@ public class CmmnUtil {
if(levyNo.equals("")) { if(levyNo.equals("")) {
levyNo = "000000"; levyNo = "000000";
} }
if(inspyNo.equals("")) { if(ispySn.equals("")) {
inspyNo = "00"; 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); String ocrVrfcCode = getOcrVrfcCode("12357", band1, 31);
band1 = band1 + ocrVrfcCode; band1 = band1 + ocrVrfcCode;
@ -561,8 +561,8 @@ public class CmmnUtil {
String acntgSeCd = dataObject.string("ACNTG_SE_CD"); String acntgSeCd = dataObject.string("ACNTG_SE_CD");
String txitmCd = dataObject.string("TXITM_CD"); String txitmCd = dataObject.string("TXITM_CD");
String levyNo = dataObject.string("LEVY_NO"); String levyNo = dataObject.string("LEVY_NO");
String inspyNo = dataObject.string("INSPY_NO"); String ispySn = dataObject.string("ISPY_SN");
String ocr0 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); String ocr0 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, ispySn);
dataObject.set("OCR0", ocr0); dataObject.set("OCR0", ocr0);
dataObject.set("OCR0_1", ocr0.substring(0, 17)); dataObject.set("OCR0_1", ocr0.substring(0, 17));

14
src/main/java/cokr/xit/fims/cmmn/pdf/print/format/Nht.java
Unescape Escape View File

@ -243,8 +243,8 @@ public class Nht extends PDFPrintFormat {
String acntgSeCd = dataObject.string("ACNTG_SE_CD"); String acntgSeCd = dataObject.string("ACNTG_SE_CD");
String txitmCd = dataObject.string("TXITM_CD"); String txitmCd = dataObject.string("TXITM_CD");
String levyNo = dataObject.string("LEVY_NO"); String levyNo = dataObject.string("LEVY_NO");
String inspyNo = dataObject.string("INSPY_NO"); String ispySn = dataObject.string("ISPY_SN");
result = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); result = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, ispySn);
} }
case "ocr2" -> { case "ocr2" -> {
String deptCode = dataObject.string("DEPT_CD"); String deptCode = dataObject.string("DEPT_CD");
@ -253,8 +253,8 @@ public class Nht extends PDFPrintFormat {
String acntgSeCd = dataObject.string("ACNTG_SE_CD"); String acntgSeCd = dataObject.string("ACNTG_SE_CD");
String txitmCd = dataObject.string("TXITM_CD"); String txitmCd = dataObject.string("TXITM_CD");
String levyNo = dataObject.string("LEVY_NO"); String levyNo = dataObject.string("LEVY_NO");
String inspyNo = dataObject.string("INSPY_NO"); String ispySn = dataObject.string("ISPY_SN");
String ocrBand1 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); String ocrBand1 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, ispySn);
String levySeCd = dataObject.string("LEVY_SE_CD"); String levySeCd = dataObject.string("LEVY_SE_CD");
int sumAmt = dataObject.number("SUM_AMT").intValue(); // 합계 금액 int sumAmt = dataObject.number("SUM_AMT").intValue(); // 합계 금액
@ -268,8 +268,8 @@ public class Nht extends PDFPrintFormat {
String acntgSeCd = dataObject.string("ACNTG_SE_CD"); String acntgSeCd = dataObject.string("ACNTG_SE_CD");
String txitmCd = dataObject.string("TXITM_CD"); String txitmCd = dataObject.string("TXITM_CD");
String levyNo = dataObject.string("LEVY_NO"); String levyNo = dataObject.string("LEVY_NO");
String inspyNo = dataObject.string("INSPY_NO"); String ispySn = dataObject.string("ISPY_SN");
String ocrBand1 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, inspyNo); String ocrBand1 = CmmnUtil.getOcrband1(deptCode, spclBizCd, fyr, acntgSeCd, txitmCd, levyNo, ispySn);
String levySeCd = dataObject.string("LEVY_SE_CD"); String levySeCd = dataObject.string("LEVY_SE_CD");
int sumAmt = dataObject.number("SUM_AMT").intValue(); // 합계 금액 int sumAmt = dataObject.number("SUM_AMT").intValue(); // 합계 금액
@ -423,7 +423,7 @@ public class Nht extends PDFPrintFormat {
dataObject.put("ACNTG_SE_CD", "61"); dataObject.put("ACNTG_SE_CD", "61");
dataObject.put("TXITM_CD", "234006"); dataObject.put("TXITM_CD", "234006");
dataObject.put("LEVY_NO", "123456"); dataObject.put("LEVY_NO", "123456");
dataObject.put("INSPY_NO", "00"); dataObject.put("ISPY_SN", "00");
dataObject.put("LEVY_SE_CD", "01"); dataObject.put("LEVY_SE_CD", "01");
dataObject.put("PCPTAX", "80000"); //본세 dataObject.put("PCPTAX", "80000"); //본세

2
src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java
Unescape Escape View File

@ -284,7 +284,7 @@ public class Levy01Controller extends ApplicationController {
valueMap.put("세목코드", format.of("TXITM_CD").style(center)); valueMap.put("세목코드", format.of("TXITM_CD").style(center));
valueMap.put("세목명", format.of("TXITM_NM").style(center)); valueMap.put("세목명", format.of("TXITM_NM").style(center));
valueMap.put("부과번호", format.of("LEVY_NO").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("LEVY_SE_NM").style(center));
valueMap.put("통합구분", format.of("UNTY_SE_NM").style(center)); valueMap.put("통합구분", format.of("UNTY_SE_NM").style(center));
valueMap.put("감경구분", format.of("RDCT_SE_NM").style(center)); valueMap.put("감경구분", format.of("RDCT_SE_NM").style(center));

10
src/main/java/cokr/xit/fims/rcvm/RcvmtQuery.java
Unescape Escape View File

@ -47,7 +47,7 @@ public class RcvmtQuery extends CmmnQuery {
private String txitmCd; // 수납(TB_RCVMT)_세목 코드 private String txitmCd; // 수납(TB_RCVMT)_세목 코드
private String operItemCd; // 수납(TB_RCVMT)_운영 항목 코드 private String operItemCd; // 수납(TB_RCVMT)_운영 항목 코드
private String levyNo; // 수납(TB_RCVMT)_부과 번호 private String levyNo; // 수납(TB_RCVMT)_부과 번호
private String inspyNo; // 수납(TB_RCVMT)_분납 번호 private String ispySn; // 수납(TB_RCVMT)_분납 번호
private String rcvmtSn; // 수납(TB_RCVMT)_수납 일련번호 private String rcvmtSn; // 수납(TB_RCVMT)_수납 일련번호
private String tsfYmd; // 수납(TB_RCVMT)_이체 일자 private String tsfYmd; // 수납(TB_RCVMT)_이체 일자
private String acntgYmd; // 수납(TB_RCVMT)_회계 일자 private String acntgYmd; // 수납(TB_RCVMT)_회계 일자
@ -315,12 +315,12 @@ public class RcvmtQuery extends CmmnQuery {
return self(); return self();
} }
public String getInspyNo() { public String getIspySn() {
return ifEmpty(inspyNo, () -> null); return ifEmpty(ispySn, () -> null);
} }
public <T extends RcvmtQuery> T setInspyNo(String inspyNo) { public <T extends RcvmtQuery> T setIspySn(String ispySn) {
this.inspyNo = inspyNo; this.ispySn = ispySn;
return self(); return self();
} }

4
src/main/webapp/WEB-INF/jsp/fims/levy/levy01050-main.jsp
Unescape Escape View File

@ -230,8 +230,8 @@
<th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('RPM_SZR_VHRNO', this.innerText, 'match', 'part');">대체압류차량</th> <th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('RPM_SZR_VHRNO', this.innerText, 'match', 'part');">대체압류차량</th>
<th class="cmn" style="width: 120px;" onclick="searchFromGridTitle('SZR_RMV_YMD', this.innerText, 'match', 'part');">압류해제일자</th> <th class="cmn" style="width: 120px;" onclick="searchFromGridTitle('SZR_RMV_YMD', this.innerText, 'match', 'part');">압류해제일자</th>
<th class="cmn" style="width: 240px;" onclick="searchFromGridTitle('EPAYNO', this.innerText, 'match', 'part');">전자납부번호</th> <th class="cmn" style="width: 240px;" onclick="searchFromGridTitle('EPAYNO', this.innerText, 'match', 'part');">전자납부번호</th>
<th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('BANK_NM', this.innerText, 'match', 'part');">은행명1</th> <th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('BANK_NM', this.innerText, 'match', 'part');">은행명</th>
<th class="cmn" style="width: 200px;" onclick="searchFromGridTitle('VR_ACTNO', this.innerText, 'match', 'part');">가상계좌번호1</th> <th class="cmn" style="width: 200px;" onclick="searchFromGridTitle('VR_ACTNO', this.innerText, 'match', 'part');">가상계좌번호</th>
<th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CRDN_YMD', this.innerText, 'ymd', '');">단속일시</th> <th class="cmn" style="width: 180px;" onclick="searchFromGridTitle('CRDN_YMD', this.innerText, 'ymd', '');">단속일시</th>
<th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('VHRNO', this.innerText, 'match', 'part');">차량번호</th> <th class="cmn" style="width: 140px;" onclick="searchFromGridTitle('VHRNO', this.innerText, 'match', 'part');">차량번호</th>
<th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('CRDN_STDG_NM', this.innerText, 'match', 'part');">법정동</th> <th class="cmn" style="width: 160px;" onclick="searchFromGridTitle('CRDN_STDG_NM', this.innerText, 'match', 'part');">법정동</th>

2
src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp
Unescape Escape View File

@ -133,7 +133,7 @@
<div class="col-md-3"> <div class="col-md-3">
<label for="levyNo--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">부과번호</label> <label for="levyNo--${pageName}" class="w-px-120 bg-lighter pe-2 col-form-label text-sm-end">부과번호</label>
<input type="text" class="form-control w-20" id="levyNo--${pageName}" name="levyNo" data-map="LEVY_NO" readonly /> <input type="text" class="form-control w-20" id="levyNo--${pageName}" name="levyNo" data-map="LEVY_NO" readonly />
<input type="text" class="form-control w-10" id="inspyNo--${pageName}" name="inspyNo" data-map="INSPY_NO" readonly /> <input type="text" class="form-control w-10" id="ispySn--${pageName}" name="ispySn" data-map="ISPY_SN" readonly />
</div> </div>
<!-- 수납 순번 --> <!-- 수납 순번 -->
<div class="col-md-3"> <div class="col-md-3">

Write Preview
Loading…
Cancel
Save