diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java index 429603b9..dff64235 100644 --- a/src/main/java/cokr/xit/fims/crdn/Crdn.java +++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java @@ -170,7 +170,7 @@ public class Crdn extends AbstractEntity { /** * 차량 색상 */ - private String vhclColor; + private String vhclColr; /** * 사용 연료 코드 @@ -185,7 +185,7 @@ public class Crdn extends AbstractEntity { /** * 주차 가능 결과 코드 */ - private String parkngPsbltyRsltCd; + private String prkPsbltyRsltCd; /** * 위반 횟수 @@ -208,9 +208,9 @@ public class Crdn extends AbstractEntity { private Integer ffnlgCrdnAmt; /** - * 과태료 감경 율 + * 과태료 감경율 */ - private String ffnlgRductRt; + private String ffnlgRdcrt; /** * 과태료 금액 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 50057300..5faf1dd1 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 @@ -160,7 +160,7 @@ public class ImportBean extends AbstractBean { crdn.setGpsY(coordinates.get("longitude")); crdn.setTowngYn("N"); - crdn.setParkngPsbltyRsltCd("0"); + crdn.setPrkPsbltyRsltCd("0"); crdn.setOvtimeYn("N"); crdn.setOpnnSbmsnYn("N"); crdn.setCrdnSttsCd("01"); @@ -225,7 +225,7 @@ public class ImportBean extends AbstractBean { } crdn.setVin(vehicle.getVin()); crdn.setVhclNm(vehicle.getCnm()); - crdn.setVhclColor(vehicle.getColor_nm()); + crdn.setVhclColr(vehicle.getColor_nm()); crdn.setUseFuelCd(vehicle.getUse_fuel_code()); crdn.setFfnlgCarmdlCd(getCarModel.apply(vehicle.getVhcty_asort_code(), vehicle.getMxmm_ldg())); crdn.setErsrRegYmd(vehicle.getErsr_regist_de()); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 77708a7a..4eceb360 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -138,7 +138,7 @@ public class Crdn06Controller extends ApplicationController { case "단속장소"->{ valueMap.put("단속장소", left); } case "사진건수"->{ valueMap.put("사진건수", center); } case "스티커번호"->{ valueMap.put("스티커번호", left); } - case "장애차량확인"->{ valueMap.put("장애차량확인", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); } + case "장애차량확인"->{ valueMap.put("장애차량확인", format.of("PRK_PSBLTY_RSLT_NM").style(center)); } case "처리상태"->{ valueMap.put("처리상태", format.of("CRDN_STTS_NM").style(center)); } case "제외사유"->{ valueMap.put("제외사유", format.of("LEVY_EXCL_RSN_NM").style(center)); } case "제외처리일자"->{ valueMap.put("제외처리일자", FormatMaker.yyyy_mm_dd(format,"LEVY_EXCL_YMD").style(dateYMD)); } diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java index a18c3b17..0ad420b3 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java @@ -183,7 +183,7 @@ public class CrdnCvlcptSubBean extends AbstractBean { crdn.setFfnlgCrdnAmt(basicAmt[0]); crdn.setFfnlgAmt(basicAmt[0]); crdn.setAdvntceAmt(basicAmt[1]); - crdn.setFfnlgRductRt("0"); + crdn.setFfnlgRdcrt("0"); } else { nonQueryRequest.put("changeAmountYn","N"); } diff --git a/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java index 5d2d1f96..45e1a28b 100644 --- a/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java +++ b/src/main/java/cokr/xit/fims/excl/dao/LevyExclMapper.java @@ -85,6 +85,6 @@ public interface LevyExclMapper extends AbstractMapper { * @param crdn 단속 대장 * @return 저장된 정보수 */ - int updateParkngPsbltyRsltCd(Crdn crdn); + int updatePrkPsbltyRsltCd(Crdn crdn); } diff --git a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java index 516bf639..f8493a94 100644 --- a/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java +++ b/src/main/java/cokr/xit/fims/excl/service/bean/LevyExclBean.java @@ -165,12 +165,12 @@ public class LevyExclBean extends AbstractBean { } // 표지정보 확인여부가 미확인(0)이면 -> 조회미대상(9) 으로 - if (levyExclInfo.string("PARKNG_PSBLTY_RSLT_CD").equals("0")) { // 주차 가능 결과 코드(FIM034) - 0: 미확인 + if (levyExclInfo.string("PRK_PSBLTY_RSLT_CD").equals("0")) { // 주차 가능 결과 코드(FIM034) - 0: 미확인 Crdn crdn = new Crdn(); crdn.setCrdnId(levyExclInfo.string("CRDN_ID")); // 단속 ID - crdn.setParkngPsbltyRsltCd("9"); // 주차 가능 결과 코드(FIM034) 9: 조회미대상 + crdn.setPrkPsbltyRsltCd("9"); // 주차 가능 결과 코드(FIM034) 9: 조회미대상 - rtnNocs = levyExclMapper.updateParkngPsbltyRsltCd(crdn); + rtnNocs = levyExclMapper.updatePrkPsbltyRsltCd(crdn); if (rtnNocs != 1) { throw new RuntimeException("부과제외 삭제 작업 중 단속 대장의 표지정보 수정에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } @@ -275,12 +275,12 @@ public class LevyExclBean extends AbstractBean { if (levyExclInfo.string("LEVY_EXCL_SE_CD").equals("1")) { // 표지정보 확인여부가 조회미대상이면 -> 미확인 으로 // 혹시 차적조회가 안되었으면? 놔두자 차적조회되면 그 때 표지정보 BJ_Send가 처리할테니 - if (levyExclInfo.string("PARKNG_PSBLTY_RSLT_CD").equals("9")) { // 주차 가능 결과 코드 - 9 조회 미대상 + if (levyExclInfo.string("PRK_PSBLTY_RSLT_CD").equals("9")) { // 주차 가능 결과 코드 - 9 조회 미대상 Crdn crdn = new Crdn(); crdn.setCrdnId(levyExclInfo.string("CRDN_ID")); // 단속 ID - crdn.setParkngPsbltyRsltCd("0"); // 주차 가능 결과 코드 - 0 미확인 + crdn.setPrkPsbltyRsltCd("0"); // 주차 가능 결과 코드 - 0 미확인 - rtnNocs = levyExclMapper.updateParkngPsbltyRsltCd(crdn); + rtnNocs = levyExclMapper.updatePrkPsbltyRsltCd(crdn); if (rtnNocs != 1) { throw new RuntimeException("부과제외 삭제 작업 중 단속 대장의 표지정보 수정에 실패하였습니다."); // 예외를 발생시켜서 DB Rollback } diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index 3852d820..59a38791 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -147,7 +147,7 @@ public class Excl01Controller extends ApplicationController { valueMap.put("처리상태", format.of("CRDN_STTS_NM")); valueMap.put("단속특별구역", format.of("CRDN_SPAREA_NM").style(center)); valueMap.put("사용연료", format.of("USE_FUEL_NM").style(center)); - valueMap.put("주차가능여부", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("주차가능여부", format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("우편번호", format.of("ZIP").style(center)); valueMap.put("주소", format.of("ADDR")); valueMap.put("상세주소", format.of("DTL_ADDR")); 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 1f4627f6..fb083e52 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -183,7 +183,7 @@ public class Excl02Controller extends ApplicationController { valueMap.put("처리상태", format.of("CRDN_STTS_NM")); valueMap.put("단속특별구역", format.of("CRDN_SPAREA_NM").style(center)); valueMap.put("사용연료", format.of("USE_FUEL_NM").style(center)); - valueMap.put("주차가능여부", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("주차가능여부", format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("우편번호", format.of("ZIP").style(center)); valueMap.put("주소", format.of("ADDR")); valueMap.put("상세주소", format.of("DTL_ADDR")); diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java index 3548b956..61897cba 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -135,7 +135,7 @@ public class Excl03Controller extends ApplicationController { valueMap.put("처리상태", format.of("CRDN_STTS_NM")); valueMap.put("단속특별구역", format.of("CRDN_SPAREA_NM").style(center)); valueMap.put("사용연료", format.of("USE_FUEL_NM").style(center)); - valueMap.put("주차가능여부", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("주차가능여부", format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("우편번호", format.of("ZIP").style(center)); valueMap.put("주소", format.of("ADDR")); valueMap.put("상세주소", format.of("DTL_ADDR")); diff --git a/src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java b/src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java index 891d9628..5404ce4a 100644 --- a/src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java +++ b/src/main/java/cokr/xit/fims/levy/service/bean/RductBean.java @@ -132,7 +132,7 @@ public class RductBean extends AbstractBean { // 단속(TB_CRDN) 대장을 수정한다. Crdn crdn = new Crdn(); crdn.setCrdnId(rduct.getCrdnId()); // 단속 ID - crdn.setFfnlgRductRt(infoCrdnRduct.string("WKSN_RDUCT_RT")); // 과태료 감경 율 + crdn.setFfnlgRdcrt(infoCrdnRduct.string("WKSN_RDCRT")); // 과태료 감경 율 crdn.setFfnlgAmt(ffnlgAmt); // 과태료 금액 crdn.setAdvntceAmt(advntceAmt); // 사전통지 금액 @@ -247,7 +247,7 @@ public class RductBean extends AbstractBean { // 단속(TB_CRDN) 대장을 수정한다. Crdn crdn = new Crdn(); crdn.setCrdnId(crdnRductInfo.string("CRDN_ID")); // 단속 ID - crdn.setFfnlgRductRt("0"); // 과태료 감경 율 + crdn.setFfnlgRdcrt("0"); // 과태료 감경 율 crdn.setFfnlgAmt(ffnlgAmt); // 과태료 금액 crdn.setAdvntceAmt(advntceAmt); // 사전통지 금액 diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java index 440b7b34..45bab8cb 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -145,7 +145,7 @@ public class Levy02Controller extends ApplicationController { valueMap.put("처리상태", format.of("CRDN_STTS_NM")); valueMap.put("단속특별구역", format.of("CRDN_SPAREA_NM").style(center)); valueMap.put("사용연료", format.of("USE_FUEL_NM").style(center)); - valueMap.put("주차가능여부", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("주차가능여부", format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("등록일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "REG_DT").style(dateDT)); valueMap.put("등록사용자", format.of("RGTR_NM").style(center)); valueMap.put("수정일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "MDFCN_DT").style(dateDT)); diff --git a/src/main/java/cokr/xit/fims/mngt/Task.java b/src/main/java/cokr/xit/fims/mngt/Task.java index 02948c72..3ac0742d 100644 --- a/src/main/java/cokr/xit/fims/mngt/Task.java +++ b/src/main/java/cokr/xit/fims/mngt/Task.java @@ -37,12 +37,12 @@ public class Task extends AbstractEntity { /** * 사전통지 감경 율 */ - private String advntceRductRt; + private String advntceRdcrt; /** * 사회적약자 감경 율 */ - private String wksnRductRt; + private String wksnRdcrt; /** * 과태료 가산 일자 diff --git a/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java b/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java index e8cd019f..2bb86c52 100644 --- a/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java +++ b/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java @@ -137,7 +137,7 @@ public class Rdca01Controller extends ApplicationController { valueMap.put("처리상태", format.of("CRDN_STTS_NM")); valueMap.put("단속특별구역", format.of("CRDN_SPAREA_NM").style(center)); valueMap.put("사용연료", format.of("USE_FUEL_NM").style(center)); - valueMap.put("주차가능여부", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("주차가능여부", format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("우편번호", format.of("ZIP").style(center)); valueMap.put("주소", format.of("ADDR")); valueMap.put("상세주소", format.of("DTL_ADDR")); diff --git a/src/main/java/cokr/xit/fims/sndb/Sndng.java b/src/main/java/cokr/xit/fims/sndb/Sndng.java index 37aa4bab..6abb1eff 100644 --- a/src/main/java/cokr/xit/fims/sndb/Sndng.java +++ b/src/main/java/cokr/xit/fims/sndb/Sndng.java @@ -120,7 +120,7 @@ public class Sndng extends AbstractEntity { /** * 재발송 여부 */ - private String resndYn; + private String rsndYn; /** * 삭제 여부 diff --git a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java index 54a466ff..19cc9ee2 100644 --- a/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java +++ b/src/main/java/cokr/xit/fims/sndb/service/bean/SndngBean.java @@ -161,8 +161,8 @@ public class SndngBean extends AbstractBean { } else { sndng.setSndngRegSeCd("01"); // 발송 등록 구분 코드 - 일괄 } - if (sndng.getResndYn() == null) { - sndng.setResndYn("N"); // 재발송 여부 + if (sndng.getRsndYn() == null) { + sndng.setRsndYn("N"); // 재발송 여부 } if (sndng.getDelYn() == null) { sndng.setDelYn("N"); // 삭제 여부 @@ -343,8 +343,8 @@ public class SndngBean extends AbstractBean { if (sndng.getGramt() == null) { sndng.setGramt(advntceTrgtList.get(0).number("GRAMT").longValue()); // 총금액 } - if (sndng.getResndYn() == null) { - sndng.setResndYn("N"); // 재발송 여부 + if (sndng.getRsndYn() == null) { + sndng.setRsndYn("N"); // 재발송 여부 } if (sndng.getDelYn() == null) { sndng.setDelYn("N"); // 삭제 여부 @@ -676,8 +676,8 @@ public class SndngBean extends AbstractBean { if (sndng.getGramt() == null) { sndng.setGramt(nhtTrgtList.get(0).number("GRAMT").longValue()); // 총금액 } - if (sndng.getResndYn() == null) { - sndng.setResndYn("N"); // 재발송 여부 + if (sndng.getRsndYn() == null) { + sndng.setRsndYn("N"); // 재발송 여부 } if (sndng.getDelYn() == null) { sndng.setDelYn("N"); // 삭제 여부 diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 354b7d4a..809e4952 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -267,7 +267,7 @@ public class Sndb01Controller extends ApplicationController { valueMap.put("상세주소", format.of("DTL_ADDR")); valueMap.put("단속특별구역", format.of("CRDN_SPAREA_NM").style(center)); valueMap.put("사용연료", format.of("USE_FUEL_NM").style(center)); - valueMap.put("주차가능여부", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("주차가능여부", format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("등록일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "REG_DT").style(dateDT)); valueMap.put("등록사용자", format.of("RGTR_NM").style(center)); valueMap.put("수정일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "MDFCN_DT").style(dateDT)); @@ -595,7 +595,7 @@ public class Sndb01Controller extends ApplicationController { valueMap.put("상세주소", format.of("DTL_ADDR")); valueMap.put("단속특별구역", format.of("CRDN_SPAREA_NM").style(center)); valueMap.put("사용연료", format.of("USE_FUEL_NM").style(center)); - valueMap.put("주차가능여부", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("주차가능여부", format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("등록일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "REG_DT").style(dateDT)); valueMap.put("등록사용자", format.of("RGTR_NM").style(center)); valueMap.put("수정일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "MDFCN_DT").style(dateDT)); @@ -936,7 +936,7 @@ public class Sndb01Controller extends ApplicationController { valueMap.put("상세주소", format.of("DTL_ADDR")); valueMap.put("단속특별구역", format.of("CRDN_SPAREA_NM").style(center)); valueMap.put("사용연료", format.of("USE_FUEL_NM").style(center)); - valueMap.put("주차가능여부", format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("주차가능여부", format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("등록일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "REG_DT").style(dateDT)); valueMap.put("등록사용자", format.of("RGTR_NM").style(center)); valueMap.put("수정일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "MDFCN_DT").style(dateDT)); diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index 09df05f1..9767fe2e 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -226,7 +226,7 @@ public class Sprt01Controller extends ApplicationController { valueMap.put("단속차량번호" , format.of("VHRNO")); valueMap.put("대체차량번호" , format.of("RPM_SZR_VHRNO")); valueMap.put("사진건수" , format.of("ATCH_FILE_CNT").style(center)); - valueMap.put("차량확인" , format.of("PARKNG_PSBLTY_RSLT_NM").style(center)); + valueMap.put("차량확인" , format.of("PRK_PSBLTY_RSLT_NM").style(center)); valueMap.put("납부자명" , format.of("RTPYR_NM").style(center)); valueMap.put("납부자번호" , format.of("RTPYR_NO").style(center)); valueMap.put("처리상태" , format.of("CRDN_STTS_NM").style(center)); @@ -682,7 +682,7 @@ public class Sprt01Controller extends ApplicationController { DataObject first = dataObjectList0.get(0); sndng.setTtlNm(first.string("TASK_SE_NM")+" "+"사전통지서"); - sndng.setResndYn("N"); + sndng.setRsndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); if(!insertSndngResult.contains("[S]")) { throw new RuntimeException(insertSndngResult); @@ -797,7 +797,7 @@ public class Sprt01Controller extends ApplicationController { DataObject first = dataObjectList0.get(0); sndng.setTtlNm(first.string("TASK_SE_NM")+" "+first.string("VLTN_ARTCL")+" "+"사전통지서"); - sndng.setResndYn("N"); + sndng.setRsndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); if(insertSndngResult.contains("[F]")) { throw new RuntimeException(insertSndngResult); @@ -922,7 +922,7 @@ public class Sprt01Controller extends ApplicationController { DataObject first = dataObjectList0.get(0); sndng.setTtlNm(first.string("TASK_SE_NM")+" "+first.string("VLTN_ARTCL")+" "+"고지서"); - sndng.setResndYn("N"); + sndng.setRsndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); if(insertSndngResult.contains("[F]")) { throw new RuntimeException(insertSndngResult); @@ -1037,7 +1037,7 @@ public class Sprt01Controller extends ApplicationController { DataObject first = dataObjectList0.get(0); sndng.setTtlNm(first.string("TASK_SE_NM")+" "+first.string("VLTN_ARTCL")+" "+"고지서"); - sndng.setResndYn("N"); + sndng.setRsndYn("N"); String insertSndngResult = sndngBean.createAdvntceSndngList(sndbQuery, sndng); if(insertSndngResult.contains("[F]")) { throw new RuntimeException(insertSndngResult); diff --git a/src/main/resources/sql/mapper/fims/admin-mapper.xml b/src/main/resources/sql/mapper/fims/admin-mapper.xml index f9c5506a..d135f442 100644 --- a/src/main/resources/sql/mapper/fims/admin-mapper.xml +++ b/src/main/resources/sql/mapper/fims/admin-mapper.xml @@ -21,7 +21,7 @@ ORDER BY ${pkName} -INSERT +INSERT INTO ${originalTable} SELECT * FROM ${backupTable} @@ -29,13 +29,13 @@ SELECT * -DELETE +DELETE FROM ${backupTable} WHERE ${pkName} IN (#{pk}) -INSERT +INSERT INTO ${backupTable} SELECT * FROM ${originalTable} @@ -43,7 +43,7 @@ SELECT * -DELETE +DELETE FROM ${originalTable} WHERE ${pkName} IN (#{pk}) @@ -55,12 +55,12 @@ SELECT #{trgtSgg} AS SGG_CD , B.TASK_SE_CD , B.TASK_SE_NM , B.ADVNTCE_DAY_CNT - , B.ADVNTCE_RDUCT_RT - , B.WKSN_RDUCT_RT + , B.ADVNTCE_RDCRT + , B.WKSN_RDCRT , B.FFNLG_ADTN_YMD , B.FFNLG_ADTN_RT , B.FFNLG_INADTN_RT - , B.FFNLG_INADTN_MXMM_CNT + , B.FFNLG_INADTN_MAX_CNT , B.NXRP_LINK_SE_CD , B.NXRP_LINK_SE_DTL_SN , B.USE_YN @@ -84,7 +84,7 @@ SELECT A.VLTN_CD SELECT LPAD(CAST(IFNULL(MAX(VLTN_ID) + 1, 1) AS INT), 10, '0') - AS NEW_ID + AS NEW_ID FROM TB_VLTN INSERT diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml index b856c832..f9f8a423 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-info-mapper.xml @@ -32,14 +32,14 @@ - + - + - + @@ -103,7 +103,7 @@ , C.VLTN_ID , C.VIN VIN , C.VHCL_NM - , C.VHCL_COLOR + , C.VHCL_COLR , C.FFNLG_CRDN_AMT , C.ETC_CN , C.ATCH_FILE_CNT @@ -133,7 +133,7 @@ , CA.TOWNG_YN , CA.USE_FUEL_CD , CA.FFNLG_CARMDL_CD - , CA.PARKNG_PSBLTY_RSLT_CD + , CA.PRK_PSBLTY_RSLT_CD , CA.VLTN_NMTM , CA.OVTIME_YN , CA.OVTIME_PRTTN_YN diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml index d62d8be3..a6890721 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-inst-mapper.xml @@ -34,9 +34,9 @@ INSERT INTO TB_CRDN ( , ATCH_FILE_CNT , VIN , VHCL_NM - , VHCL_COLOR + , VHCL_COLR , FFNLG_CRDN_AMT - , FFNLG_RDUCT_RT + , FFNLG_RDCRT , FFNLG_AMT , ADVNTCE_BGNG_YMD , ADVNTCE_DUDT_YMD @@ -84,10 +84,10 @@ INSERT INTO TB_CRDN ( , #{atchFileCnt} , #{vin} , #{vhclNm} - , #{vhclColor} - , #{ffnlgCrdnAmt} - , #{ffnlgRductRt} - , #{ffnlgAmt} + , #{vhclColr} + , #{ffnlgCrdnAmt} + , #{ffnlgRdcrt} + , #{ffnlgAmt} , #{advntceBgngYmd} , #{advntceDudtYmd} , #{advntceAmt} @@ -125,7 +125,7 @@ INSERT INTO TB_CRDN_ADI ( , TOWNG_YN , USE_FUEL_CD , FFNLG_CARMDL_CD - , PARKNG_PSBLTY_RSLT_CD + , PRK_PSBLTY_RSLT_CD , VLTN_NMTM , OVTIME_YN , OVTIME_PRTTN_YN @@ -151,7 +151,7 @@ INSERT INTO TB_CRDN_ADI ( , #{towngYn} , #{useFuelCd} , #{ffnlgCarmdlCd} - , #{parkngPsbltyRsltCd} + , #{prkPsbltyRsltCd} , #{vltnNmtm} , IFNULL(#{ovtimeYn},'N') , 'N' diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index 1a54bdbd..8de16bc7 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -32,9 +32,9 @@ SELECT C.CRDN_ID , C.ATCH_FILE_CNT , C.VIN , C.VHCL_NM - , C.VHCL_COLOR + , C.VHCL_COLR , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD @@ -68,8 +68,8 @@ SELECT C.CRDN_ID , CA.TOWNG_YN , CA.USE_FUEL_CD , CA.FFNLG_CARMDL_CD - , CA.PARKNG_PSBLTY_RSLT_CD - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , CA.PRK_PSBLTY_RSLT_CD + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , CA.VLTN_NMTM , CA.OVTIME_YN , CC.CVLCPT_LINK_ID @@ -162,7 +162,7 @@ AND CA.TOWNG_YN = #{towngYn} C.CRDN_PLC C.ATCH_FILE_CNT CA.CRDN_SN - CA.PARKNG_PSBLTY_RSLT_CD + CA.PRK_PSBLTY_RSLT_CD C.CRDN_STTS_CD LE.LEVY_EXCL_RSN_CD LE.LEVY_EXCL_YMD @@ -438,7 +438,7 @@ SELECT C.CRDN_ID WHERE C.DEL_YN = 'N' AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = 'DPV' - AND CA.PARKNG_PSBLTY_RSLT_CD = '0' + AND CA.PRK_PSBLTY_RSLT_CD = '0' AND C.CRDN_STTS_CD = '21' 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 057ba68b..ab5dcb4b 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 @@ -34,11 +34,11 @@ , GPS_Y = #{gpsY} , VIN = #{vin} , VHCL_NM = #{vhclNm} - , VHCL_COLOR = #{vhclColor} + , VHCL_COLR = #{vhclColr} , ETC_CN = #{etcCn} , FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} , FFNLG_AMT = #{ffnlgAmt} - , FFNLG_RDUCT_RT = #{ffnlgRductRt} + , FFNLG_RDCRT = #{ffnlgRdcrt} , ADVNTCE_AMT = #{advntceAmt} , CRDN_STTS_CD = #{crdnSttsCd} @@ -65,7 +65,7 @@ , USE_FUEL_CD = #{useFuelCd} - , PARKNG_PSBLTY_RSLT_CD = #{parkngPsbltyRsltCd} + , PRK_PSBLTY_RSLT_CD = #{prkPsbltyRsltCd} , VLTN_NMTM = #{vltnNmtm} @@ -86,7 +86,7 @@ /* 표지정보확인 수정(crdnUpdtMapper.updateTagInfo) */ UPDATE TB_CRDN_ADI - SET PARKNG_PSBLTY_RSLT_CD = '1' + SET PRK_PSBLTY_RSLT_CD = '1' , MDFCN_DT = /* 수정일시 */ , MDFR = #{modifiedBy} /* 수정자 */ WHERE CRDN_ID = #{crdnId} /* 단속 ID */ @@ -137,7 +137,7 @@ , GPS_Y = #{gpsY} , VIN = #{vin} , VHCL_NM = #{vhclNm} - , VHCL_COLOR = #{vhclColor} + , VHCL_COLR = #{vhclColr} , FFNLG_CRDN_AMT = #{ffnlgCrdnAmt} , FFNLG_AMT = #{ffnlgAmt} , ADVNTCE_AMT = #{advntceAmt} 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 ea12c5ad..e3a388ba 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -95,9 +95,9 @@ SELECT C.CRDN_ID , C.ATCH_FILE_CNT , C.VIN , C.VHCL_NM - , C.VHCL_COLOR + , C.VHCL_COLR , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD @@ -123,7 +123,7 @@ SELECT C.CRDN_ID , CA.TOWNG_YN , CA.USE_FUEL_CD , CA.FFNLG_CARMDL_CD - , CA.PARKNG_PSBLTY_RSLT_CD + , CA.PRK_PSBLTY_RSLT_CD , CA.VLTN_NMTM , CA.OVTIME_YN , CC.CVLCPT_LINK_ID @@ -335,14 +335,14 @@ SELECT C.CRDN_ID , C.VHRNO , C.ETC_CN , C.VHCL_NM - , C.VHCL_COLOR + , C.VHCL_COLR , C.VIN , C.LINK_TBL_NM , C.LINK_ID , CA.CRDN_SE_CD , CA.DTL_CRDN_PLC , CA.CRDN_SPAREA_CD - , CA.PARKNG_PSBLTY_RSLT_CD + , CA.PRK_PSBLTY_RSLT_CD , CA.TOWNG_YN , CA.USE_FUEL_CD , CC.CVLCPT_APLCNT_NM @@ -610,12 +610,12 @@ SELECT CC.CVLCPT_LINK_ID /* 민원 연계 ID */ AND A.VLTN_CD = #{crdn.vltnCd}) /* 위반 ID */ , VIN = #{crdn.vin} /* 차대번호 */ , VHCL_NM = #{crdn.vhclNm} /* 차량 명 */ - , VHCL_COLOR = #{crdn.vhclColor} /* 차량 색상 */ + , VHCL_COLR = #{crdn.vhclColr} /* 차량 색상 */ , ETC_CN = #{crdn.etcCn} /* 기타 내용 */ , FFNLG_CRDN_AMT = #{crdn.ffnlgCrdnAmt} /* 과태료 단속 금액 */ , FFNLG_AMT = #{crdn.ffnlgAmt} /* 과태료 금액 */ - , FFNLG_RDUCT_RT = #{crdn.ffnlgRductRt} /* 과태료 감경 율 */ + , FFNLG_RDCRT = #{crdn.ffnlgRdcrt} /* 과태료 감경 율 */ , ADVNTCE_AMT = #{crdn.advntceAmt} /* 사전통지 금액 */ @@ -643,7 +643,7 @@ SELECT CC.CVLCPT_LINK_ID /* 민원 연계 ID */ , USE_FUEL_CD = #{crdn.useFuelCd} - , PARKNG_PSBLTY_RSLT_CD = #{crdn.parkngBsbltyRsltCd} + , PRK_PSBLTY_RSLT_CD = #{crdn.prkPsbltyRsltCd} , VLTN_NMTM = #{crdn.vltnNmtm} @@ -701,9 +701,9 @@ INSERT , ATCH_FILE_CNT , VIN , VHCL_NM - , VHCL_COLOR + , VHCL_COLR , FFNLG_CRDN_AMT - , FFNLG_RDUCT_RT + , FFNLG_RDCRT , FFNLG_AMT , ADVNTCE_AMT , ETC_CN @@ -737,9 +737,9 @@ SELECT #{newCrdnId} , ATCH_FILE_CNT , VIN , VHCL_NM - , VHCL_COLOR + , VHCL_COLR , FFNLG_CRDN_AMT - , FFNLG_RDUCT_RT + , FFNLG_RDCRT , FFNLG_AMT , ADVNTCE_AMT , ETC_CN @@ -764,7 +764,7 @@ INSERT , TOWNG_YN , USE_FUEL_CD , FFNLG_CARMDL_CD - , PARKNG_PSBLTY_RSLT_CD + , PRK_PSBLTY_RSLT_CD , VLTN_NMTM , OVTIME_YN , OVTIME_PRTTN_YN @@ -787,7 +787,7 @@ SELECT #{newCrdnId} , TOWNG_YN , USE_FUEL_CD , FFNLG_CARMDL_CD - , PARKNG_PSBLTY_RSLT_CD + , PRK_PSBLTY_RSLT_CD , VLTN_NMTM , OVTIME_YN , OVTIME_PRTTN_YN diff --git a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml index 9b4204ef..a4cdc017 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -55,8 +55,8 @@ , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , CA.CRDN_SPAREA_CD , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM - , CA.PARKNG_PSBLTY_RSLT_CD - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , CA.PRK_PSBLTY_RSLT_CD + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , V.VLTN_ID , V.VLTN_CD , V.VLTN_ARTCL @@ -268,9 +268,9 @@ , C.ATCH_FILE_CNT , C.VIN , C.VHCL_NM - , C.VHCL_COLOR + , C.VHCL_COLR , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD @@ -298,7 +298,7 @@ , CA.TOWNG_YN , CA.USE_FUEL_CD , CA.FFNLG_CARMDL_CD - , CA.PARKNG_PSBLTY_RSLT_CD + , CA.PRK_PSBLTY_RSLT_NM , CA.VLTN_NMTM , CA.OVTIME_YN , (SELECT VLTN_CD FROM TB_VLTN X WHERE X.VLTN_ID=C.VLTN_ID AND X.SGG_CD=C.SGG_CD AND X.TASK_SE_CD=C.TASK_SE_CD) AS VLTN_CD diff --git a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml index dc44d1d0..776cf462 100644 --- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml @@ -58,7 +58,7 @@ , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM , (SELECT GET_CODE_NM('LVS005', CA.USE_FUEL_CD) FROM DUAL) AS USE_FUEL_NM - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , V.VLTN_ID , V.VLTN_CD , V.VLTN_ARTCL @@ -212,7 +212,7 @@ , C.CRDN_PLC , C.CRDN_STTS_CD , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM - , CA.PARKNG_PSBLTY_RSLT_CD + , CA.PRK_PSBLTY_RSLT_CD , CC.CVLCPT_LINK_ID , CC.CVLCPT_PRCS_CD , L.LEVY_ID @@ -312,9 +312,9 @@ AND DEL_YN = 'N' - /* 단속 대장 주차가능결과코드를 수정(levyExclMapper.updateParkngPsbltyRsltCd) */ + /* 단속 대장 주차가능결과코드를 수정(levyExclMapper.updatePrkPsbltyRsltCd) */ UPDATE TB_CRDN_ADI - SET PARKNG_PSBLTY_RSLT_CD= #{parkngPsbltyRsltCd} + SET PRK_PSBLTY_RSLT_CD = #{prkPsbltyRsltCd} , MDFCN_DT = , MDFR = #{modifiedBy} WHERE CRDN_ID = #{crdnId} diff --git a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml index 6b16fbb9..c2a98834 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -96,7 +96,7 @@ , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , V.VLTN_ID , V.VLTN_CD , V.VLTN_ARTCL @@ -112,7 +112,7 @@ , R.RDUCT_ID , R.RDUCT_RSN_CD , (CASE WHEN R.RDUCT_AMT IS NOT NULL THEN R.RDUCT_AMT - ELSE (SELECT C.FFNLG_CRDN_AMT*T.WKSN_RDUCT_RT/100 FROM TB_TASK T WHERE C.SGG_CD=T.SGG_CD AND C.TASK_SE_CD=T.TASK_SE_CD AND T.USE_YN='Y') + ELSE (SELECT C.FFNLG_CRDN_AMT*T.WKSN_RDCRT/100 FROM TB_TASK T WHERE C.SGG_CD=T.SGG_CD AND C.TASK_SE_CD=T.TASK_SE_CD AND T.USE_YN='Y') END ) AS RDUCT_AMT FROM TB_OPNN_SBMSN OS INNER JOIN TB_CRDN C ON (OS.CRDN_ID = C.CRDN_ID) @@ -291,7 +291,7 @@ , OS.RGTR , OS.MDFCN_DT , OS.MDFR - , (SELECT C.FFNLG_CRDN_AMT*T.WKSN_RDUCT_RT/100 FROM TB_TASK T + , (SELECT C.FFNLG_CRDN_AMT*T.WKSN_RDCRT/100 FROM TB_TASK T WHERE C.SGG_CD=T.SGG_CD AND C.TASK_SE_CD=T.TASK_SE_CD AND T.USE_YN='Y') AS RDUCT_AMT , P.RTPYR_ID , P.RTPYR_NO diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml index d4c7689f..388e0315 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -1023,7 +1023,7 @@ , C.CRDN_PLC , C.VLTN_ID , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD diff --git a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml index ad808fcf..2578495b 100644 --- a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml @@ -50,17 +50,17 @@ , C.CRDN_ROAD_NM , C.CRDN_PLC , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.ADVNTCE_AMT , C.CRDN_STTS_CD , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , CA.CRDN_SE_CD , CA.CRDN_SPAREA_CD - , CA.PARKNG_PSBLTY_RSLT_CD + , CA.PRK_PSBLTY_RSLT_CD , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , P.RTPYR_ID , P.RTPYR_SE_CD , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM @@ -201,7 +201,7 @@ , C.TASK_SE_CD , C.VHRNO , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT AS WKSN_RDUCT_RT + , C.FFNLG_RDCRT AS WKSN_RDCRT , C.FFNLG_AMT , C.ADVNTCE_AMT , C.CRDN_STTS_CD @@ -324,10 +324,10 @@ , C.TASK_SE_CD , C.VHRNO , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.CRDN_STTS_CD - , T.WKSN_RDUCT_RT + , T.WKSN_RDCRT , T.ADVNTCE_RDUCT_RT , P.RTPYR_ID , P.RTPYR_NO @@ -342,8 +342,8 @@ , L.RDCAMT_PCPTAX , L.RDCAMT_ADAMT , R.RDUCT_ID - , AS TODAY - , C.FFNLG_CRDN_AMT * T.WKSN_RDUCT_RT / 100 AS CALC_RDUCT_AMT + , AS TODAY + , C.FFNLG_CRDN_AMT * T.WKSN_RDCRT / 100 AS CALC_RDUCT_AMT , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM FROM TB_CRDN C INNER JOIN TB_TASK T ON (C.SGG_CD = T.SGG_CD AND C.TASK_SE_CD = T.TASK_SE_CD AND T.USE_YN = 'Y') @@ -363,7 +363,7 @@ /* 단속 대장 과태료 감경 금액 수정(rductMapper.updateCrdnRduct) */ UPDATE TB_CRDN - SET FFNLG_RDUCT_RT = #{ffnlgRductRt} + SET FFNLG_RDCRT = #{ffnlgRdcrt} , FFNLG_AMT = #{ffnlgAmt} , ADVNTCE_AMT = #{advntceAmt} , MDFCN_DT = diff --git a/src/main/resources/sql/mapper/fims/mngt/task-mapper.xml b/src/main/resources/sql/mapper/fims/mngt/task-mapper.xml index b5040eb2..d8cd1559 100644 --- a/src/main/resources/sql/mapper/fims/mngt/task-mapper.xml +++ b/src/main/resources/sql/mapper/fims/mngt/task-mapper.xml @@ -12,12 +12,12 @@ - - + + - + @@ -32,12 +32,12 @@ , T.TASK_SE_CD , T.TASK_SE_NM , T.ADVNTCE_DAY_CNT - , T.ADVNTCE_RDUCT_RT - , T.WKSN_RDUCT_RT + , T.ADVNTCE_RDCRT + , T.WKSN_RDCRT , T.FFNLG_ADTN_YMD , T.FFNLG_ADTN_RT , T.FFNLG_INADTN_RT - , T.FFNLG_INADTN_MXMM_CNT + , T.FFNLG_INADTN_MAX_CNT , T.NXRP_LINK_SE_CD , T.NXRP_LINK_SE_DTL_SN , T.USE_YN @@ -96,12 +96,12 @@ , TASK_SE_CD , TASK_SE_NM , ADVNTCE_DAY_CNT - , ADVNTCE_RDUCT_RT - , WKSN_RDUCT_RT + , ADVNTCE_RDCRT + , WKSN_RDCRT , FFNLG_ADTN_YMD , FFNLG_ADTN_RT , FFNLG_INADTN_RT - , FFNLG_INADTN_MXMM_CNT + , FFNLG_INADTN_MAX_CNT , NXRP_LINK_SE_CD , NXRP_LINK_SE_DTL_SN , USE_YN @@ -115,14 +115,14 @@ , #{task.taskSeCd} , #{task.taskSeNm} , #{task.advntceDayCnt} - , #{task.advntceRductRt} - , #{task.wksnRductRt} + , #{task.advntceRdcrt} + , #{task.wksnRdcrt} , #{task.ffnlgAdtnYmd} , #{task.ffnlgAdtnRt} , #{task.ffnlgInadtnRt} - , #{task.ffnlgInadtnMxmmCnt} + , #{task.ffnlgInadtnMaxCnt} , #{task.nxrpLinkSeCd} - , #{task.nxrpLinkSeDtlSn} + , #{task.nxrpLinkSeDtlSn} , 'Y' , , #{currentUser.id} @@ -133,20 +133,20 @@ /* 업무 정보 수정(taskMapper.updateTask) */ UPDATE TB_TASK - SET TASK_SE_NM = #{task.taskSeNm} - , ADVNTCE_DAY_CNT = #{task.advntceDayCnt} - , ADVNTCE_RDUCT_RT = #{task.advntceRductRt} - , WKSN_RDUCT_RT = #{task.wksnRductRt} - , FFNLG_ADTN_YMD = #{task.ffnlgAdtnYmd} - , FFNLG_ADTN_RT = #{task.ffnlgAdtnRt} - , FFNLG_INADTN_RT = #{task.ffnlgInadtnRt} - , FFNLG_INADTN_MXMM_CNT= #{task.ffnlgInadtnMxmmCnt} - , NXRP_LINK_SE_CD = #{task.nxrpLinkSeCd} - , NXRP_LINK_SE_DTL_SN = #{task.nxrpLinkSeDtlSn} + SET TASK_SE_NM = #{task.taskSeNm} + , ADVNTCE_DAY_CNT = #{task.advntceDayCnt} + , ADVNTCE_RDCRT = #{task.advntceRdcrt} + , WKSN_RDCRT = #{task.wksnRdcrt} + , FFNLG_ADTN_YMD = #{task.ffnlgAdtnYmd} + , FFNLG_ADTN_RT = #{task.ffnlgAdtnRt} + , FFNLG_INADTN_RT = #{task.ffnlgInadtnRt} + , FFNLG_INADTN_MAX_CNT = #{task.ffnlgInadtnMaxCnt} + , NXRP_LINK_SE_CD = #{task.nxrpLinkSeCd} + , NXRP_LINK_SE_DTL_SN = #{task.nxrpLinkSeDtlSn} , MDFCN_DT = - , MDFR = #{currentUser.id} - WHERE SGG_CD = #{task.sggCd} - AND TASK_SE_CD = #{task.taskSeCd} + , MDFR = #{currentUser.id} + WHERE SGG_CD = #{task.sggCd} + AND TASK_SE_CD = #{task.taskSeCd} AND USE_YN = 'Y' diff --git a/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml b/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml index 7d8f677f..5117210c 100644 --- a/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/nxrp/nisA01-mapper.xml @@ -531,18 +531,18 @@ , C.CRDN_YMD , C.CRDN_TM , C.VHRNO - , C.CRDN_STDG_NM - , C.CRDN_ROAD_NM - , C.CRDN_PLC - , C.VLTN_ID - , C.GPS_X - , C.GPS_Y - , C.ATCH_FILE_CNT - , C.VIN - , C.VHCL_NM - , C.VHCL_COLOR - , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.CRDN_STDG_NM + , C.CRDN_ROAD_NM + , C.CRDN_PLC + , C.VLTN_ID + , C.GPS_X + , C.GPS_Y + , C.ATCH_FILE_CNT + , C.VIN + , C.VHCL_NM + , C.VHCL_COLR + , C.FFNLG_CRDN_AMT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD @@ -566,7 +566,7 @@ , CA.TOWNG_YN , CA.USE_FUEL_CD , CA.FFNLG_CARMDL_CD - , CA.PARKNG_PSBLTY_RSLT_CD + , CA.PRK_PSBLTY_RSLT_CD , CA.VLTN_NMTM , CA.OVTIME_YN , CA.OVTIME_PRTTN_YN diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml index 1b7a84d2..df397109 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml @@ -28,7 +28,7 @@ - + @@ -62,7 +62,7 @@ , S.DIV_KB , S.EPOST_NOTICE_ID , S.SNDNG_STTS_CD - , S.RESND_YN + , S.RSND_YN , S.REG_DT , S.RGTR , S.MDFCN_DT @@ -225,14 +225,14 @@ , CA.CRDN_SN , CA.USE_FUEL_CD , CA.FFNLG_CARMDL_CD - , CA.PARKNG_PSBLTY_RSLT_CD + , CA.PRK_PSBLTY_RSLT_CD , CA.VLTN_NMTM , CA.OVTIME_YN , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM , (SELECT GET_CODE_NM('LVS005', CA.USE_FUEL_CD) FROM DUAL) AS USE_FUEL_NM , (SELECT GET_CODE_NM('FIM009', CA.FFNLG_CARMDL_CD) FROM DUAL) AS FFNLG_CARMDL_NM - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , V.VLTN_ID , V.VLTN_CD , V.VLTN_ARTCL @@ -379,7 +379,7 @@ CA.CRDN_SN CA.USE_FUEL_CD CA.FFNLG_CARMDL_CD - CA.PARKNG_PSBLTY_RSLT_CD + CA.PRK_PSBLTY_RSLT_CD CA.VLTN_NMTM CA.OVTIME_YN V.VLTN_ARTCL @@ -465,8 +465,8 @@ , (SELECT GET_CODE_NM('LVS005', CA.USE_FUEL_CD) FROM DUAL) AS USE_FUEL_NM , CA.FFNLG_CARMDL_CD , (SELECT GET_CODE_NM('FIM009', CA.FFNLG_CARMDL_CD) FROM DUAL) AS FFNLG_CARMDL_NM - , CA.PARKNG_PSBLTY_RSLT_CD - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , CA.PRK_PSBLTY_RSLT_CD + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , CA.VLTN_NMTM , CA.OVTIME_YN , V.VLTN_ID @@ -599,7 +599,7 @@ CA.CRDN_SN CA.USE_FUEL_CD CA.FFNLG_CARMDL_CD - CA.PARKNG_PSBLTY_RSLT_CD + CA.PRK_PSBLTY_RSLT_CD CA.VLTN_NMTM CA.OVTIME_YN V.VLTN_ARTCL @@ -782,8 +782,8 @@ , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM , CA.CRDN_SPAREA_CD , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM - , CA.PARKNG_PSBLTY_RSLT_CD - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , CA.PRK_PSBLTY_RSLT_CD + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , V.VLTN_ID , V.VLTN_CD , V.VLTN_ARTCL @@ -938,7 +938,7 @@ , DIV_KB , EPOST_NOTICE_ID , SNDNG_STTS_CD - , RESND_YN + , RSND_YN , DEL_YN , REG_DT , RGTR @@ -969,7 +969,7 @@ , #{divKb} , #{epostNoticeId} , #{sndngSttsCd} - , #{resndYn} + , #{RsndYn} , #{delYn} , , #{createdBy} @@ -995,7 +995,7 @@ , DIV_KB = #{divKb} , EPOST_NOTICE_ID = #{epostNoticeId} , SNDNG_STTS_CD = #{sndngSttsCd} - , RESND_YN = #{resndYn} + , RSND_YN = #{rsndYn} , MDFCN_DT = , MDFR = #{modifiedBy} WHERE SNDNG_ID = #{sndngId} diff --git a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml index 05bc0b25..05266aa3 100644 --- a/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/sndngDtl-mapper.xml @@ -220,7 +220,7 @@ , (SELECT GET_CODE_NM('EGP002', S.DIV_KB) FROM DUAL) AS DIV_KB_NM , S.EPOST_NOTICE_ID , S.SNDNG_STTS_CD - , S.RESND_YN + , S.RSND_YN FROM TB_SNDNG_DTL SD LEFT OUTER JOIN TB_SNDNG S ON (SD.SNDNG_ID = S.SNDNG_ID) @@ -784,7 +784,7 @@ , (SELECT GET_CODE_NM('FIM067', S.SNDNG_REG_SE_CD) FROM DUAL) AS SNDNG_REG_SE_NM , S.EPOST_NOTICE_ID , S.SNDNG_STTS_CD - , S.RESND_YN + , S.RSND_YN , C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD @@ -858,7 +858,7 @@ AND S.TASK_SE_CD = #{taskSeCd} - AND (S.RESND_YN IS NULL OR S.RESND_YN = 'N') + AND (S.RSND_YN IS NULL OR S.RSND_YN = 'N') AND (SD.SVBTC_ID IS NULL OR SD.SVBTC_ID = '') AND (SD.SNDNG_RCVMT_CD IS NULL OR SD.SNDNG_RCVMT_CD = '') 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 540120f6..ea3e25c8 100644 --- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml @@ -29,8 +29,8 @@ , L.RPM_SZR_VHRNO , (GET_CODE_NM('FIM009', CA.FFNLG_CARMDL_CD)) AS FFNLG_CARMDL_NM , C.ATCH_FILE_CNT - , CA.PARKNG_PSBLTY_RSLT_CD - , (GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD)) AS PARKNG_PSBLTY_RSLT_NM + , CA.PRK_PSBLTY_RSLT_CD + , (GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD)) AS PRK_PSBLTY_RSLT_NM , P.RTPYR_ID , P.RTPYR_INPT_SE_CD , P.RTPYR_SE_CD @@ -66,7 +66,7 @@ , (GET_CODE_NM('FIM022', LE.LEVY_EXCL_RSN_CD)) AS LEVY_EXCL_RSN_NM , LE.LEVY_EXCL_YMD , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD @@ -300,7 +300,7 @@ LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = ' C.VHRNO L.RPM_SZR_VHRNO C.ATCH_FILE_CNT - CA.PARKNG_PSBLTY_RSLT_CD + CA.PRK_PSBLTY_RSLT_CD P.RTPYR_NM P.RTPYR_NO C.CRDN_STTS_CD diff --git a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml index 787b7bd9..b0ef5ead 100644 --- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml @@ -52,9 +52,9 @@ , C.ATCH_FILE_CNT , C.VIN , C.VHCL_NM - , C.VHCL_COLOR + , C.VHCL_COLR , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT + , C.FFNLG_RDCRT , C.FFNLG_AMT , C.ADVNTCE_BGNG_YMD , C.ADVNTCE_DUDT_YMD @@ -93,8 +93,8 @@ , (SELECT GET_CODE_NM('LVS005', CA.USE_FUEL_CD) FROM DUAL) AS USE_FUEL_NM , CA.FFNLG_CARMDL_CD , (SELECT GET_CODE_NM('FIM009', CA.FFNLG_CARMDL_CD) FROM DUAL) AS FFNLG_CARMDL_NM - , CA.PARKNG_PSBLTY_RSLT_CD - , (SELECT GET_CODE_NM('FIM034', CA.PARKNG_PSBLTY_RSLT_CD) FROM DUAL) AS PARKNG_PSBLTY_RSLT_NM + , CA.PRK_PSBLTY_RSLT_CD + , (SELECT GET_CODE_NM('FIM034', CA.PRK_PSBLTY_RSLT_CD) FROM DUAL) AS PRK_PSBLTY_RSLT_NM , CA.VLTN_NMTM , CA.OVTIME_YN , (SELECT GET_CODE_NM('CMN006', CA.OVTIME_YN) FROM DUAL) AS OVTIME_NM diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index c194a0fb..431c9368 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -199,12 +199,12 @@ placeholder="입력항목이 아닙니다." />
- -
@@ -272,12 +272,12 @@