From 9be74fff86f953a3d988d31e40f995170accca8b Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 24 Aug 2023 09:33:55 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EB=AF=BC=EC=9B=90=EB=82=B4=EC=9A=A9?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EA=B3=BC=ED=83=9C=EB=A3=8C?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/mapper/fims/crdn/import-mapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/sql/mapper/fims/crdn/import-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/import-mapper.xml index 304011a3..abfd7add 100644 --- a/src/main/resources/sql/mapper/fims/crdn/import-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/import-mapper.xml @@ -20,7 +20,8 @@ SELECT CASE WHEN A.SGG_CD = B.SGG_CD THEN A.SGG_CD ELSE 'DIFF' END SGG_CD /* importMapper.selectViolationCodes(위반내용 관련 코드 조회) */ SELECT CASE WHEN VLTN LIKE CONCAT('%', '전용차로', '%') THEN 'BPV' WHEN VLTN LIKE CONCAT('%', '장애인', '%') - AND VLTN NOT LIKE CONCAT('%', '보호구역', '%') THEN 'DPV' + AND VLTN NOT LIKE CONCAT('%', '장애인보호구역', '%') THEN 'DPV' WHEN VLTN LIKE CONCAT('%', '전기차', '%') OR VLTN LIKE CONCAT('%', '친환경차', '%') THEN 'ECA' WHEN VLTN LIKE CONCAT('%', '밤샘', '%') THEN 'TPV' From 250dafc2e1eff3a37c90b6dd445164eb7d7ca2be Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 24 Aug 2023 10:55:25 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=EB=B0=98=EC=86=A1(=ED=9A=8C=EC=88=98)?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/fims/crdn/dao/CrdnUpdtMapper.java | 5 +++ .../cvlc/service/bean/CrdnCvlcptBean.java | 21 +++++----- .../service/bean/CrdnCvlcptServiceBean.java | 40 ++++++++++++++++++- .../sql/mapper/fims/crdn/crdn-updt-mapper.xml | 10 +++++ .../mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 6 +-- .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp | 3 +- 6 files changed, 69 insertions(+), 16 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/dao/CrdnUpdtMapper.java b/src/main/java/cokr/xit/fims/crdn/dao/CrdnUpdtMapper.java index 36ab7c6c..f7ff3459 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/CrdnUpdtMapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/CrdnUpdtMapper.java @@ -12,6 +12,11 @@ import cokr.xit.foundation.component.AbstractMapper; */ @Mapper("crdnUpdtMapper") public interface CrdnUpdtMapper extends AbstractMapper { + /**단속 상태를 변경한다. + * @param crdn 단속 대장 + * @return 저장된 정보수 + */ + int updateCrdnStatus(Crdn crdn); /**표지정보 미확인 자료를 확인 자료로 수정한다. * @param crdn 단속 대장 diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java index 1c98b427..97687439 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java @@ -216,10 +216,8 @@ public class CrdnCvlcptBean extends AbstractComponent { Petition petition = new Petition(); petition.setInterfaceSeqN(cvlcptInfo.string("CVLCPT_LINK_ID")); //민원연계키 - petition.setSysGubunC("EC010008"); //시스템 구분 --> ex)EC010008 과태료시스템 - String APLY_NSTT_CD = cvlcptInfo.string("PETI_ANC_CODE_V"); - petition.setAncCodeV(APLY_NSTT_CD); //기관 코드(신청기관코드) - petition.setPetiAncCodeV(APLY_NSTT_CD); //민원 기관 코드(최초신청기관코드) + petition.setSysGubunC("EC010008"); //시스템 구분("EC010008") + petition.setPetiAncCodeV(cvlcptInfo.string("PETI_ANC_CODE_V")); //민원 기관 코드(최초신청기관코드) petition.setPetiGubunC(isSendBack ? "140" : "180"); //민원구분 petition.setSendYnC(isSendBack? "1" : "2"); // 송신 여부 @@ -229,20 +227,23 @@ public class CrdnCvlcptBean extends AbstractComponent { petition.setPetiTitleV(cvlcptInfo.string("CVLCPT_APLY_TTL_NM")); //민원제목 petition.setCivilGistV(cvlcptInfo.string("CVLCPT_GIST")); //민원요지 petition.setCivilAbstractL(cvlcptInfo.string("CVLCPT_PRCS_SUMRY")); //민원 처리 요약 - petition.setPcdDeptV(cvlcptInfo.string("CVLCPT_PRCS_DEPT_CD")); //처리 부서 코드(7자리) + petition.setAncCodeV(cvlcptInfo.string("CVLCPT_PRCS_NSTT_CD")); //기관 코드 + petition.setPcdDeptV(cvlcptInfo.string("CVLCPT_PRCS_DEPT_CD")); //처리 부서 코드 + petition.setPcdAncCodeV(cvlcptInfo.string("CVLCPT_PRCS_DEPT_CD")); //민원 실 처리 기관 코드 petition.setPcdDeptNmV(cvlcptInfo.string("CVLCPT_PRCS_DEPT_NM")); //민원 처리 부서명 petition.setDutyIdV(cvlcptInfo.string("CVLCPT_PRCS_PIC_NM")); //민원 처리 담당자 명 petition.setPcdEmailV(cvlcptInfo.string("CVLCPT_PRCS_PIC_EMAIL")); //담당자 이메일 petition.setPcdTelV(cvlcptInfo.string("CVLCPT_PRCS_PIC_TELNO")); //담당자 전화번호 petition.setPcdRstContL(cvlcptInfo.string("CVLCPT_PRCS_RSLT_CN")); //민원 처리 결과 petition.setDoRegD(cvlcptInfo.string("CVLCPT_PRCS_CMPTN_DT")); //민원 처리 완료 일자 - petition.setPcdAncCodeV(cvlcptInfo.string("CVLCPT_PRCS_")); //민원 실 처리 기관 코드 - petition.setPcdRstContAttachYnC("N"); //민원 처리 결과 첨부 여부 + petition.setRegD((new SimpleDateFormat("yyyyMMddHHmmss")).format(new Date())); // 등록 일자 - petition.setPcdGubunV("");// 처리 구분1? - petition.setPcdGubun2V("");// 처리 구분2? - petition.setPcdGubun3V("");//처리 구분3? + //not use + petition.setPcdRstContAttachYnC("N"); //민원 처리 결과 첨부 여부 + petition.setPcdGubunV(""); //처리 구분1 + petition.setPcdGubun2V("");//처리 구분2 + petition.setPcdGubun3V("");//처리 구분3 //DB --> XML petition.setApplyGubunC("N"); //완료구분 diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index ecf0ed52..8102adae 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -304,9 +304,47 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv throw new RuntimeException("반송 처리 중 단속민원답변 수정에 실패하였습니다."); } + boolean result = crdnCvlcptBean.insertTransmitInfo(true, crdnInfo.string("CVLCPT_LINK_ID")); + if (!result) { + throw new RuntimeException("반송 처리 중 전송자료 등록에 실패하였습니다."); + } + } + + //단속상태를 변경한다. + Crdn crdn = new Crdn(); + crdn.setCrdnId(crdnId); + crdn.setCrdnSttsCd("81"); + saved = crdnUpdtMapper.updateCrdnStatus(crdn) == 1 ? true : false; + if (!saved) { + throw new RuntimeException("반송처리 중 단속상태변경에 실패하였습니다."); } - //TODO : 단속상태변경? + //부과제외 대장을 등록 한다. + Excl01 excl01 = new Excl01(); + excl01.setSggCd(globalStngMapper.selectSggCdForCurrentUser()); + excl01.setTaskSeCd(crdnInfo.string("TASK_SE_CD")); + excl01.setCrdnId(crdnInfo.string("CRDN_ID")); + excl01.setLevyExclYmd((new SimpleDateFormat("yyyyMMdd")).format(new Date())); + excl01.setLevyExclSeCd("1"); + excl01.setLevyExclRsnCd("191"); + excl01.setEtcCn("이송(이첩)"); + saved = excl01Bean.createLevyExcl(excl01); + if (!saved) { + throw new RuntimeException("반송처리 중 부과제외 대장 등록에 실패하였습니다."); + } + + //단속상태 변경 이력 기록 + CrdnSttsHstry crdnSttsHstry = new CrdnSttsHstry(); + crdnSttsHstry.setCrdnId(crdnId); + crdnSttsHstry.setBfrSttsCd(crdnInfo.string("CRDN_STTS_CD")); + crdnSttsHstry.setBfrSttsChgDt(crdnInfo.string("CRDN_STTS_CHG_DT")); + crdnSttsHstry.setCrdnSttsCd("81"); + crdnSttsHstry.setTaskDtlId(excl01.getLevyExclId()); + crdnSttsHstry.setEtcCn("이송(이첩)"); + saved = crdnSttsHstryMapper.insert(crdnSttsHstry); + if (!saved) { + throw new RuntimeException("반송 처리 중 단속상태이력 등록에 실패하였습니다."); + } return saved; } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml index 09b11ecc..473d8ed9 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml @@ -2,6 +2,16 @@ + + /* 단속 상태 수정(crdnUpdtMapper.updateCrdnStatus) */ + UPDATE TB_CRDN + SET MDFCN_DT = /* 수정일시 */ + , MDFR = #{modifiedBy} /* 수정자 */ + , CRDN_STTS_CD = #{crdnSttsCd} /* 단속 상태 */ + , CRDN_STTS_CHG_DT = /* 단속 상태 변경 일시 */ + WHERE CRDN_ID = #{crdnId} /* 단속 ID */ + + /* 단속정보 수정(crdnUpdtMapper.updateCrdn) */ UPDATE TB_CRDN diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index 718befcf..66cb6c29 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -320,7 +320,7 @@ SELECT C.CRDN_ID , CVLCPT_PRCS_CD = '01' /* 민원처리코드 */ - , CVLCPT_TRSM_CD = '01' /* 민원전송코드 */ + , CVLCPT_TRSM_CD = '04' /* 민원전송코드 */ , CVLCPT_PRCS_SUMRY = '' /* 민원처리요약 */ , CVLCPT_PRCS_RSLT_CN = '' /* 민원처리결과내용 */ @@ -714,14 +714,14 @@ SELECT CC.CVLCPT_LINK_ID /* 민원 연계 ID */ , CC.CVLCPT_PRCS_PIC_NM /* 민원 처리 담당자 명 */ , U.EML_ADRS AS CVLCPT_PRCS_PIC_EMAIL /* 민원 처리 담당자 이메일 */ , U.TELNO AS CVLCPT_PRCS_PIC_TELNO /* 민원 처리 담당자 전화번호 */ - , U.DEPT_CD AS CVLCPT_PRCS_DEPT_CD /* 민원 처리 부서 코드 */ + , U.DEPT_CD AS CVLCPT_PRCS_DEPT_CD /* 민원 처리 부서 코드, 실 처리 기관 코드 */ , (SELECT DEPT_NM FROM TB_DEPT_INFO DI WHERE DI.DEPT_CD = U.DEPT_CD AND DI.SGG_CD = SI.SGG_CD AND ROWNUM = 1 ) AS CVLCPT_PRCS_DEPT_NM /* 민원 처리 부서 명 */ - , U.NSTT_CD AS CVLCPT_PRCS_NSTT_CD /* 민원 실 처리 기관 코드 */ + , U.NSTT_CD AS CVLCPT_PRCS_NSTT_CD /* 민원 처리 기관 코드 */ , EI.PETI_ANC_CODE_V /* 민원 기관코드 */ FROM TB_CRDN_CVLCPT CC INNER JOIN TB_ESB_INTERFACE EI ON (CC.CVLCPT_LINK_ID = EI.INTERFACE_SEQ_N) diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index dab841b4..c7f32e60 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -565,8 +565,7 @@ $(document).ready(function(){ success : resp => { if(resp.saved){ var message = "민원회수 요청이 등록되었습니다.\n" - +"해당 자료를 서손처리하시기 바랍니다.\n" - +"서손처리 후 30~60분 사이에 서버에서 민원시스템으로 전송이 진행되니 이후에 민원시스템에서 확인하시기 바랍니다."; + +"30~60분 사이에 서버에서 민원시스템으로 전송이 진행되니 이후에 민원시스템에서 확인하시기 바랍니다."; dialog.alert(message); var crdnId = $("#crdnId--${pageName}").val(); From 7e598c22c6a0c6a80381d441db30fd77b37ecee5 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 24 Aug 2023 11:09:02 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EB=B0=A9=ED=95=B4=EC=97=AC=EB=B6=80=20?= =?UTF-8?q?=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/crdn/service/bean/ImportBean.java | 2 +- .../java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java | 2 +- .../cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java index cc804b33..f3114ffc 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportBean.java @@ -209,7 +209,7 @@ public class ImportBean extends AbstractComponent { CrdnCvlcpt cvlcpt = new CrdnCvlcpt(); cvlcpt.setCvlcptLinkId(petition.getInterfaceSeqN()); - cvlcpt.setDstrbncYn("03".equals(violation.getCode()) ? "Y" : "N"); + cvlcpt.setDstrbncYn("N"); String rcptYmd = parseDate.apply(petition.getAncRegD()); if (rcptYmd != null && rcptYmd.length() >= 8) cvlcpt.setCvlcptRcptYmd(rcptYmd.substring(0, 8)); diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java index 97687439..5848236b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptBean.java @@ -147,7 +147,7 @@ public class CrdnCvlcptBean extends AbstractComponent { crdnQuery.setAnsSeCd("3"); crdnQuery.setAnsRsnCd("3"+dataInfo.string("VLTN_CD")); - if(dataInfo.string("DSTRBNC_YN").equals("Y")) { + if(crdnQuery.getAnsRsnCd().equals("301") && dataInfo.string("DSTRBNC_YN").equals("Y")) { crdnQuery.setDstrbncYn("Y"); } diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index 8102adae..ea6526d2 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -389,7 +389,7 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv crdnQuery.setSggCd(globalStngMapper.selectSggCdForCurrentUser()); crdnQuery.setTaskSeCd(crdn.getTaskSeCd()); crdnQuery.setAnsRsnCd(ansRsnCd); - if(ifEmpty(crdnCvlcpt.getDstrbncYn(), () -> "").equals("Y")) { + if(crdn.getVltnCd().equals("01") && ifEmpty(crdnCvlcpt.getDstrbncYn(), () -> "").equals("Y")) { crdnQuery.setDstrbncYn("Y"); } From 2f51a2dfb5b6f42b3b59323f155b7c3533ebf79f Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 24 Aug 2023 13:00:34 +0900 Subject: [PATCH 5/6] =?UTF-8?q?SprtQuery.java=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/sprt/{service => }/SprtQuery.java | 2 +- src/main/java/cokr/xit/fims/sprt/dao/Sprt01Mapper.java | 2 +- src/main/java/cokr/xit/fims/sprt/dao/Sprt02Mapper.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/cokr/xit/fims/sprt/{service => }/SprtQuery.java (93%) diff --git a/src/main/java/cokr/xit/fims/sprt/service/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java similarity index 93% rename from src/main/java/cokr/xit/fims/sprt/service/SprtQuery.java rename to src/main/java/cokr/xit/fims/sprt/SprtQuery.java index 3607c5c3..97e19a59 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -1,4 +1,4 @@ -package cokr.xit.fims.sprt.service; +package cokr.xit.fims.sprt; import cokr.xit.foundation.component.QueryRequest; diff --git a/src/main/java/cokr/xit/fims/sprt/dao/Sprt01Mapper.java b/src/main/java/cokr/xit/fims/sprt/dao/Sprt01Mapper.java index e9fa78c0..ac89aa40 100644 --- a/src/main/java/cokr/xit/fims/sprt/dao/Sprt01Mapper.java +++ b/src/main/java/cokr/xit/fims/sprt/dao/Sprt01Mapper.java @@ -4,7 +4,7 @@ import java.util.List; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.sprt.service.SprtQuery; +import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; diff --git a/src/main/java/cokr/xit/fims/sprt/dao/Sprt02Mapper.java b/src/main/java/cokr/xit/fims/sprt/dao/Sprt02Mapper.java index 2d1bbda3..4f496b30 100644 --- a/src/main/java/cokr/xit/fims/sprt/dao/Sprt02Mapper.java +++ b/src/main/java/cokr/xit/fims/sprt/dao/Sprt02Mapper.java @@ -4,7 +4,7 @@ import java.util.List; import org.egovframe.rte.psl.dataaccess.mapper.Mapper; -import cokr.xit.fims.sprt.service.SprtQuery; +import cokr.xit.fims.sprt.SprtQuery; import cokr.xit.foundation.component.AbstractMapper; import cokr.xit.foundation.data.DataObject; From d2336d26ab241c7f7c6054d3012f5df7034108c7 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 24 Aug 2023 14:18:15 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EC=A0=84=EA=B8=B0=EC=B0=A8=20=EC=9C=84?= =?UTF-8?q?=EB=B0=98=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java | 3 +++ src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java | 3 ++- src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java index 6f0f9dea..76dc11bc 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java @@ -153,6 +153,9 @@ public class CrdnStngBean extends AbstractComponent { } else if(taskSeCd.equals("ECA")) { + query.setAmtDcsnCdGroupId("FIM061"); + query.setAmtDcsnCd(crdn.getVltnCd()); + int ffnlgCrdnAmt = Integer.parseInt(ifEmpty(globalStngMapper.selectBasicAmt(query), () -> "0")); amt[0] = ffnlgCrdnAmt; amt[1] = (int)(ffnlgCrdnAmt * 0.8); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index 13629820..63f785e9 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -101,7 +101,8 @@ public class Crdn05Controller extends ApplicationController { switch(urlTaskSeCd) { case "PVS" -> { vltnByTask = "WEB002"; } case "BPV" -> { vltnByTask = "FIM005"; } - case "DPV","ECA" -> { vltnByTask = "FIM006"; } + case "DPV" -> { vltnByTask = "FIM006"; } + case "ECA" -> { vltnByTask = "FIM061"; } } Map> commonCodes = getCodesOf("FIM011","FIM053","LVS005",vltnByTask); mav.addObject("FIM011List", commonCodes.get("FIM011")); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index 29ed9096..a835945b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -148,7 +148,8 @@ public class Cvlc01Controller extends ApplicationController { switch(urlTaskSeCd) { case "PVS" -> { vltnByTask = "WEB002"; } case "BPV" -> { vltnByTask = "FIM005"; } - case "DPV","ECA" -> { vltnByTask = "FIM006"; } + case "DPV" -> { vltnByTask = "FIM006"; } + case "ECA" -> { vltnByTask = "FIM061"; } } Map> commonCodes = getCodesOf("FIM011","FIM053","LVS005",vltnByTask); mav.addObject("FIM011List", commonCodes.get("FIM011"));