From ad1a1665dc172d13eb56562a206073fa83072cc9 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 12 Apr 2024 16:24:14 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EB=82=98=ED=81=90=EB=B8=8C=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/cmmn/hwp/InsertingImageCell.java | 5 ++--- .../cokr/xit/fims/cmmn/service/bean/StngServiceBean.java | 2 +- src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java | 2 +- .../java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java | 2 +- .../java/cokr/xit/fims/payer/service/bean/PayerBean.java | 5 +++-- src/main/java/cokr/xit/fims/task/web/DpvController.java | 2 +- src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/hwp/InsertingImageCell.java b/src/main/java/cokr/xit/fims/cmmn/hwp/InsertingImageCell.java index 4735f7c1..45643a64 100644 --- a/src/main/java/cokr/xit/fims/cmmn/hwp/InsertingImageCell.java +++ b/src/main/java/cokr/xit/fims/cmmn/hwp/InsertingImageCell.java @@ -130,8 +130,8 @@ public class InsertingImageCell { private void createRectangleControlAtCell() { ArrayList cellList = CellFinder.findAll(hwpFile, fieldName); - for (Cell c : cellList) { - + if(cellList != null && !cellList.isEmpty()) { + Cell c = cellList.get(0); int cellWidth = (int)c.getListHeader().getWidth(); int cellHeight = (int)c.getListHeader().getHeight(); shapePosition = new Rectangle(1, 1, cellWidth, cellHeight); @@ -148,7 +148,6 @@ public class InsertingImageCell { // 문단에 사각형 컨트롤 추가한다. rectangle = (ControlRectangle) firstPara.addNewGsoControl(GsoControlType.Rectangle); - break; } } diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngServiceBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngServiceBean.java index 2100e393..bd1652fe 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngServiceBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngServiceBean.java @@ -45,7 +45,7 @@ public class StngServiceBean extends AbstractServiceBean implements StngService } } - return result ? "[S]" : "[F]"; + return "[S]"; } @Override diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index dbea5fde..56cd6d11 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -147,7 +147,7 @@ public class Excl02Controller extends ApplicationController { valueMap.put("소유주관계", xlsx.style("OWNR_REL_NM", center)); valueMap.put("진술자명", "STTR_NM"); valueMap.put("진술자생일", xlsx.style("STTR_BRDT_MASK", center)); - valueMap.put("우편번호", xlsx.style("STTR_ZIP", center)); + valueMap.put("진술자우편번호", xlsx.style("STTR_ZIP", center)); valueMap.put("진술자주소", "STTR_ADDR"); valueMap.put("진술자상세주소", "STTR_DADDR"); valueMap.put("의견제출상태", xlsx.style("OPNN_SBMSN_STTS_NM", center)); diff --git a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java index da7160ea..c4d9d8d5 100644 --- a/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java +++ b/src/main/java/cokr/xit/fims/nxrp/service/bean/NisIndivBean.java @@ -157,7 +157,7 @@ public class NisIndivBean extends AbstractComponent { nisIndivA01.setPyrSeCd("05"); } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("03")) { // 법인(03) -> 법인(02) nisIndivA01.setPyrSeCd("02"); - } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("03")) { // 사업자(04) -> 사업자(04) + } else if (selectCrdnInfo.string("RTPYR_SE_CD").equals("04")) { // 사업자(04) -> 사업자(04) nisIndivA01.setPyrSeCd("04"); } else { // 기타(05) -> 단체(03) nisIndivA01.setPyrSeCd("03"); diff --git a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java index ec413f37..a25a52fb 100644 --- a/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java +++ b/src/main/java/cokr/xit/fims/payer/service/bean/PayerBean.java @@ -187,8 +187,9 @@ public class PayerBean extends AbstractComponent { // Payer result = create(payer) ? payer : getPayer(vhrno, rtpyrNo); // 납부자 정보를 등록한다. -> 차적 조회된 납부자 정보를 return 한다. - Payer result = create(payer) ? payer : payer; - + //Payer result = create(payer) ? payer : payer; + create(payer); + Payer result = payer; if (result != null) result.setVehicleInfo(basicInfo); diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index 6c76bdd1..c6dee5c3 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -287,7 +287,7 @@ public class DpvController { } @Override - @RequestMapping(name="장애인태료업무 단속자료 파일 등록 화면", value=METHOD_URL.getFileRegistrationScreen) + @RequestMapping(name="장애인과태료업무 단속자료 파일 등록 화면", value=METHOD_URL.getFileRegistrationScreen) public ModelAndView getFileRegistrationScreen(HttpServletRequest hReq) { return super.getFileRegistrationScreen(hReq); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp index 4991bc54..8a12b7fb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp @@ -221,7 +221,7 @@ 소유주관계 진술자명 진술자생일 - 우편번호 + 진술자우편번호 진술자주소 진술자상세주소 의견제출상태