diff --git a/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java b/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java index 8cfb8adb..bab11baa 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst01Controller.java @@ -31,7 +31,7 @@ public class Epst01Controller extends ApplicationController { } /**전자우편 접수 등록 서비스*/ - @Resource(name = "epostRcptRegService") + @Resource(name="epostRcptRegService") private EpostRcptRegService epostRcptRegService; /**전자우편 접수 등록를 등록한다. diff --git a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java index b7753600..9d13bc37 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -65,26 +65,26 @@ public class Epst02Controller extends ApplicationController { } /**전자우편 안내문 서비스*/ - @Resource(name = "epostGdccService") + @Resource(name="epostGdccService") private EpostGdccService epostGdccService; /**전자우편 접수 등록 서비스*/ - @Resource(name = "epostRcptRegService") + @Resource(name="epostRcptRegService") private EpostRcptRegService epostRcptRegService; /**전자우편 접수 상세 서비스*/ - @Resource(name = "epostRcptDtlService") + @Resource(name="epostRcptDtlService") private EpostRcptDtlService epostRcptDtlService; /**전자우편 접수 결과 서비스*/ - @Resource(name = "epostRcptRsltService") + @Resource(name="epostRcptRsltService") private EpostRcptRsltService epostRcptRsltService; /**부서 정보 서비스*/ - @Resource(name = "deptService") + @Resource(name="deptService") private DeptService deptService; - @Resource(name = "stngBean") + @Resource(name="stngBean") private StngBean stngBean; /**전자우편 안내문 관리 메인화면(epostGdcc/epostGdcc-main)을 연다. 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 f6c6c77f..f8bb2373 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -2,6 +2,7 @@ package cokr.xit.fims.excl.web; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,10 +52,10 @@ public class Excl01Controller extends ApplicationController { } /** 부과제외 대장 서비스 */ - @Resource(name = "levyExclService") + @Resource(name="levyExclService") protected LevyExclService levyExclService; - @Resource(name = "stngBean") + @Resource(name="stngBean") private StngBean stngBean; /**부과제외 관리 메인화면(fims/excl/excl01/010-main)을 연다. @@ -79,7 +80,6 @@ public class Excl01Controller extends ApplicationController { .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) - .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) ; } @@ -103,7 +103,7 @@ public class Excl01Controller extends ApplicationController { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); String dateTime = dateFormat.format(System.currentTimeMillis()); - ArrayList cellDefs = fromJson(req.getCellDefs(), new TypeReference>() {}); + List cellDefs = fromJson(req.getCellDefs(), CellDef.listType()); XLSWriter xlsx = new XLSWriter() .setFilename("부과제외" + "_목록_" + dateTime + ".xlsx") @@ -117,38 +117,38 @@ public class Excl01Controller extends ApplicationController { List list = levyExclService.getLevyExclList(req.setFetchSize(0)); - CellDef.setValues(cellDefs, Map.ofEntries( - Map.entry("업무구분", xlsx.style("TASK_SE_NM", center)) - , Map.entry("부과제외일자", xlsx.format(o -> xlsx.str2date(o.get("LEVY_EXCL_YMD"))).style(dateYMD)) - , Map.entry("부과제외구분", xlsx.style("LEVY_EXCL_SE_NM", center)) - , Map.entry("부과제외사유", "LEVY_EXCL_RSN_NM") - , Map.entry("기타내용", "ETC_CN") - , Map.entry("민원신청번호", xlsx.style("CVLCPT_APLY_NO", center)) - , Map.entry("민원접수번호", xlsx.style("CVLCPT_RCPT_NO", center)) - , Map.entry("민원접수일자", xlsx.format(o -> xlsx.str2date(o.get("CVLCPT_RCPT_YMD"))).style(dateYMD)) - , Map.entry("단속일시", xlsx.format(o -> xlsx.str2datetime(o.get("CRDN_YMD_TM"))).style(dateDT)) - , Map.entry("차량번호", "VHRNO") - , Map.entry("납부자구분", xlsx.style("RTPYR_SE_NM", center)) - , Map.entry("납부자번호", xlsx.style("RTPYR_NO", center)) - , Map.entry("납부자명", "RTPYR_NM") - , Map.entry("단속법정동", xlsx.style("CRDN_STDG_NM", center)) - , Map.entry("단속장소", "CRDN_PLC") - , Map.entry("상세단속장소", "DTL_CRDN_PLC") - , Map.entry("위반항목", "VLTN_ARTCL") - , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) - , Map.entry("처리상태", "CRDN_STTS_NM") - , Map.entry("단속특별구역", xlsx.style("CRDN_SPAREA_NM", center)) - , Map.entry("사용연료", xlsx.style("USE_FUEL_NM", center)) - , Map.entry("주차가능여부", xlsx.style("PARKNG_PSBLTY_RSLT_NM", center)) - , Map.entry("우편번호", xlsx.style("ZIP", center)) - , Map.entry("주소", "ADDR") - , Map.entry("상세주소", "DTL_ADDR") - , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) - , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) - , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) - , Map.entry("수정사용자", xlsx.style("MDFR_NM", center)) - ) - ); + Map valueMap = new HashMap(); + valueMap.put("업무구분", xlsx.style("TASK_SE_NM", center)); + valueMap.put("부과제외일자", xlsx.format(o -> xlsx.str2date(o.get("LEVY_EXCL_YMD"))).style(dateYMD)); + valueMap.put("부과제외구분", xlsx.style("LEVY_EXCL_SE_NM", center)); + valueMap.put("부과제외사유", "LEVY_EXCL_RSN_NM"); + valueMap.put("기타내용", "ETC_CN"); + valueMap.put("민원신청번호", xlsx.style("CVLCPT_APLY_NO", center)); + valueMap.put("민원접수번호", xlsx.style("CVLCPT_RCPT_NO", center)); + valueMap.put("민원접수일자", xlsx.format(o -> xlsx.str2date(o.get("CVLCPT_RCPT_YMD"))).style(dateYMD)); + valueMap.put("단속일시", xlsx.format(o -> xlsx.str2datetime(o.get("CRDN_YMD_TM"))).style(dateDT)); + valueMap.put("차량번호", "VHRNO"); + valueMap.put("납부자구분", xlsx.style("RTPYR_SE_NM", center)); + valueMap.put("납부자번호", xlsx.style("RTPYR_NO", center)); + valueMap.put("납부자명", "RTPYR_NM"); + valueMap.put("단속법정동", xlsx.style("CRDN_STDG_NM", center)); + valueMap.put("단속장소", "CRDN_PLC"); + valueMap.put("상세단속장소", "DTL_CRDN_PLC"); + valueMap.put("위반항목", "VLTN_ARTCL"); + valueMap.put("단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)); + valueMap.put("처리상태", "CRDN_STTS_NM"); + valueMap.put("단속특별구역", xlsx.style("CRDN_SPAREA_NM", center)); + valueMap.put("사용연료", xlsx.style("USE_FUEL_NM", center)); + valueMap.put("주차가능여부", xlsx.style("PARKNG_PSBLTY_RSLT_NM", center)); + valueMap.put("우편번호", xlsx.style("ZIP", center)); + valueMap.put("주소", "ADDR"); + valueMap.put("상세주소", "DTL_ADDR"); + valueMap.put("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)); + valueMap.put("등록사용자", xlsx.style("RGTR_NM", center)); + valueMap.put("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)); + valueMap.put("수정사용자", xlsx.style("MDFR_NM", center)); + + CellDef.setValues(cellDefs, valueMap); xlsx.cell(0, 0) .value("부과제외", center) 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 25447d3a..8aa0ee05 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -155,7 +155,7 @@ public class Excl02Controller extends ApplicationController { , Map.entry("단속장소", "CRDN_PLC") , Map.entry("상세단속장소", "DTL_CRDN_PLC") , Map.entry("위반항목", "VLTN_ARTCL") - , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) + , Map.entry("단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) , Map.entry("과태료금액", xlsx.style("FFNLG_AMT", numeric)) , Map.entry("처리상태", "CRDN_STTS_NM") , Map.entry("단속특별구역", xlsx.style("CRDN_SPAREA_NM", center)) 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 f5e19d74..517f5690 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -128,7 +128,7 @@ public class Excl03Controller extends ApplicationController { , Map.entry("단속장소", "CRDN_PLC") , Map.entry("상세단속장소", "DTL_CRDN_PLC") , Map.entry("위반항목", "VLTN_ARTCL") - , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) + , Map.entry("단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) , Map.entry("처리상태", "CRDN_STTS_NM") , Map.entry("단속특별구역", xlsx.style("CRDN_SPAREA_NM", center)) , Map.entry("사용연료", xlsx.style("USE_FUEL_NM", center)) diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java index 2ce3c33c..31f0949c 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java @@ -53,14 +53,14 @@ public class Levy01Controller extends ApplicationController { } /**부과 대장 서비스*/ - @Resource(name = "levyService") + @Resource(name="levyService") private LevyService levyService; /** 업무 정보 서비스 */ - @Resource(name = "taskService") + @Resource(name="taskService") private TaskService taskService; - @Resource(name = "stngBean") + @Resource(name="stngBean") private StngBean stngBean; /**사전 감경부과 대상 메인화면(levy/levy01010-main)을 연다. @@ -126,7 +126,7 @@ public class Levy01Controller extends ApplicationController { , Map.entry("법정동", "CRDN_STDG_NM") , Map.entry("단속장소", "CRDN_PLC") , Map.entry("위반항목", "VLTN_ARTCL") - , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) + , Map.entry("단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) , Map.entry("과태료금액", xlsx.style("FFNLG_AMT", numeric)) , Map.entry("사전통지금액", xlsx.style("ADVNTCE_AMT", numeric)) , Map.entry("처리상태", "CRDN_STTS_NM") @@ -287,7 +287,7 @@ public class Levy01Controller extends ApplicationController { , Map.entry("수납가산금", xlsx.style("RCVMT_ADAMT", numeric)) , Map.entry("감액본세", xlsx.style("RDCAMT_PCPTAX", numeric)) , Map.entry("감액가산금", xlsx.style("RDCAMT_ADAMT", numeric)) - , Map.entry("합계금액", xlsx.style("SUM_AMT", numeric)) + , Map.entry("미납금액", xlsx.style("SUM_AMT", numeric)) , Map.entry("과세물건", "TXTN_THING") , Map.entry("체납사유", "NPMNT_RSN_NM") , Map.entry("수납일자", xlsx.format(o -> xlsx.str2date(o.get("RCVMT_YMD"))).style(dateYMD)) @@ -307,7 +307,7 @@ public class Levy01Controller extends ApplicationController { , Map.entry("법정동", "CRDN_STDG_NM") , Map.entry("단속장소", "CRDN_PLC") , Map.entry("위반항목", "VLTN_ARTCL") - , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) + , Map.entry("단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) , Map.entry("처리상태", "CRDN_STTS_NM") , Map.entry("납부자구분", xlsx.style("RTPYR_SE_NM", center)) , Map.entry("납부자번호", xlsx.style("RTPYR_NO", center)) 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 78f6802f..e17f37d0 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -1,16 +1,25 @@ package cokr.xit.fims.levy.web; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.annotation.Resource; +import org.apache.poi.ss.usermodel.CellStyle; import org.springframework.web.servlet.ModelAndView; +import com.fasterxml.jackson.core.type.TypeReference; + import cokr.xit.base.code.CommonCode; +import cokr.xit.base.file.xls.XLSWriter; +import cokr.xit.base.file.xls.XLSWriter.CellDef; +import cokr.xit.base.file.xls.XLSWriter.Styler; import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.levy.LevyQuery; @@ -34,21 +43,21 @@ public class Levy02Controller extends ApplicationController { public class METHOD_URL { public static final String - reductionMain = "/010/main.do" // 과태료 감경 관리 메인 화면 - , getRductList = "/010/list.do" // 과태료 감경 대장 목록 조회 - , removeRduct = "/010/remove.do" // 과태료 감경 대장 삭제 - , removeRductList = "/010/removes.do" // 과태료 감경 대장 목록 삭제 - , getRductInfo = "/020/info.do" // 과태료 감경 정보 조회 - , createRduct = "/020/create.do" // 과태료 감경 대장 등럭 - , updateRduct = "/020/update.do" // 과태료 감경 대장 수정 + reductionMain = "/010/main.do" // 과태료 감경 관리 메인 화면 + , getRductList = "/010/list.do" // 과태료 감경 대장 목록 조회 + , removeRduct = "/010/remove.do" // 과태료 감경 대장 삭제 + , removeRductList = "/010/removes.do" // 과태료 감경 대장 목록 삭제 + , getRductInfo = "/020/info.do" // 과태료 감경 정보 조회 + , createRduct = "/020/create.do" // 과태료 감경 대장 등럭 + , updateRduct = "/020/update.do" // 과태료 감경 대장 수정 ; } /**과태료 감경 대장 서비스*/ - @Resource(name = "rductService") + @Resource(name="rductService") private RductService rductService; - @Resource(name = "stngBean") + @Resource(name="stngBean") private StngBean stngBean; @Resource(name="userMapper") @@ -62,35 +71,20 @@ public class Levy02Controller extends ApplicationController { * @return /rduct/rduct-main */ public ModelAndView reductionMain() { -// ModelAndView mav = new ModelAndView("fims/levy/levy02010-main"); -// + ModelAndView mav = new ModelAndView("fims/levy/levy02010-main"); + // 사용자 정보 ManagedUser managedUser = (ManagedUser)currentUser().getUser(); -// -// // View(jsp)에서 사용할 공통코드를 조회 -// Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); -// -// return mav.addObject("pageName", "levy02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix -// .addObject("infoPrefix", "rductLevyTrgt") // prefix -// .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) -// .addObject("FIM010List", commonCodes.get("FIM010")) // 단속 처리 상태 코드(CRDN_STTS_CD) -// .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDUCT_RSN_CD) -// .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) -// ; - - - ModelAndView mav = getRductList(new LevyQuery().setPageNum(1)); - - mav.setViewName("fims/levy/levy02010-main"); - mav.addObject("pageName","levy02010"); - - // View(jsp)에서 사용할 공통코드를 조회 - Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); - mav.addObject("FIM054List", commonCodes.get("FIM054")); - mav.addObject("TaskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))); - addCodes(commonCodes, mav, "FIM010", "FIM019"); - - return mav.addObject("rductList", toJson(mav.getModel().get("rductList"))); + + // View(jsp)에서 사용할 공통코드를 조회 + Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); + + return mav.addObject("pageName", "levy02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix + .addObject("infoPrefix", "rduct") // prefix + .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) + .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDUCT_RSN_CD) + ; } /**과태료 감경 대장 목록을 조회하여 반환한다.
@@ -105,13 +99,67 @@ public class Levy02Controller extends ApplicationController { * } */ public ModelAndView getRductList(LevyQuery req) { - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); - String sggCd = globalStngMapper.selectSggCd(curDeptCode); - req.setSggCd(sggCd); - List result = rductService.getRductList(setFetchSize(req)); - - return setCollectionInfo(new ModelAndView("jsonView"), result, ""); + if (!"xls".equals(req.getDownload())) { + List result = rductService.getRductList(setFetchSize(req)); + return setCollectionInfo(new ModelAndView("jsonView"), result, "rduct"); + } else { + // 현재 날짜 구하기 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); + String dateTime = dateFormat.format(System.currentTimeMillis()); + + ArrayList cellDefs = fromJson(req.getCellDefs(), new TypeReference>() {}); + + XLSWriter xlsx = new XLSWriter() + .setFilename("부과제외" + "_목록_" + dateTime + ".xlsx") + .worksheet(0); + + // CellStyle 지정은 여기에서.. + CellStyle center = xlsx.cellStyle(Styler.CENTER); // 가운데 정렬 + CellStyle numeric = xlsx.n_nn0(); // 숫자 3자리 콤마(,) + CellStyle dateYMD = xlsx.yyyy_mm_dd(); // 연월일 + CellStyle dateDT = xlsx.yyyy_mm_dd_hh_mm_ss(); // 연월일+시간 + + List list = rductService.getRductList(req.setFetchSize(0)); + + CellDef.setValues(cellDefs, Map.ofEntries( + Map.entry("업무구분", xlsx.style("TASK_SE_NM", center)) + , Map.entry("감경일자", xlsx.format(o -> xlsx.str2date(o.get("RDUCT_YMD"))).style(dateYMD)) + , Map.entry("감경사유", "RDUCT_RSN_CD") + , Map.entry("기타내용", "ETC_CN") + , Map.entry("단속일시", xlsx.format(o -> xlsx.str2datetime(o.get("CRDN_YMD_TM"))).style(dateDT)) + , Map.entry("차량번호", "VHRNO") + , Map.entry("납부자구분", xlsx.style("RTPYR_SE_NM", center)) + , Map.entry("납부자번호", xlsx.style("RTPYR_NO", center)) + , Map.entry("납부자명", "RTPYR_NM") + , Map.entry("단속법정동", xlsx.style("CRDN_STDG_NM", center)) + , Map.entry("단속장소", "CRDN_PLC") + , Map.entry("상세단속장소", "DTL_CRDN_PLC") + , Map.entry("단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) + , Map.entry("감경금액", xlsx.style("RDUCT_AMT", numeric)) + , Map.entry("과태료금액", xlsx.style("FFNLG_AMT", numeric)) + , Map.entry("미납금액", xlsx.style("SUM_AMT", numeric)) + , Map.entry("처리상태", "CRDN_STTS_NM") + , Map.entry("단속특별구역", xlsx.style("CRDN_SPAREA_NM", center)) + , Map.entry("사용연료", xlsx.style("USE_FUEL_NM", center)) + , Map.entry("주차가능여부", xlsx.style("PARKNG_PSBLTY_RSLT_NM", center)) + , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) + , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) + , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) + , Map.entry("수정사용자", xlsx.style("MDFR_NM", center)) + ) + ); + + xlsx.cell(0, 0) + .value("부과제외", center) + .merge(0, cellDefs.size() - 1) + .cell(3, 0) + .rowValues(CellDef.header(cellDefs, () -> CmmnUtil.headerStyle(xlsx))) + .cell(4, 0) + .values(list, CellDef.values(cellDefs)); + + return new ModelAndView("xlsView") + .addObject("xls", xlsx); + } } /**지정한 ID의 과태료 감경 정보(info)를 반환한다. @@ -144,6 +192,7 @@ public class Levy02Controller extends ApplicationController { return mav .addObject("pageName", "levy02020") + .addObject("callPurpose", req.getCallPurpose()) // 호출 용도 .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDUCT_RSN_CD) .addObject("rductInfo", json ? rductInfo : toJson(rductInfo)) ; diff --git a/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java b/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java index 6627dfd5..021a514d 100644 --- a/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java +++ b/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java @@ -52,10 +52,10 @@ public class Rcvm01Controller extends ApplicationController { } /**수납 대장 서비스*/ - @Resource(name = "rcvmtService") + @Resource(name="rcvmtService") private RcvmtService rcvmtService; - @Resource(name = "stngBean") + @Resource(name="stngBean") private StngBean stngBean; /**수납 대장 관리 메인화면(rcvmt/rcvmt-main)을 연다. 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 3754938c..a915b117 100644 --- a/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java +++ b/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java @@ -136,7 +136,7 @@ public class Rdca01Controller extends ApplicationController { , Map.entry("단속장소", "CRDN_PLC") , Map.entry("상세단속장소", "DTL_CRDN_PLC") , Map.entry("위반항목", "VLTN_ARTCL") - , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) + , Map.entry("단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) , Map.entry("처리상태", "CRDN_STTS_NM") , Map.entry("단속특별구역", xlsx.style("CRDN_SPAREA_NM", center)) , Map.entry("사용연료", xlsx.style("USE_FUEL_NM", center)) 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 f640c794..238622b5 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -100,22 +100,22 @@ public class Sndb01Controller extends ApplicationController { } /**발송 대장 서비스*/ - @Resource(name = "sndngService") + @Resource(name="sndngService") private SndngService sndngService; /**발송 상세 서비스*/ - @Resource(name = "sndngDtlService") + @Resource(name="sndngDtlService") private SndngDtlService sndngDtlService; /**공시송달 대장 서비스*/ - @Resource(name = "svbtcService") + @Resource(name="svbtcService") private SvbtcService svbtcService; /**업무 정보 서비스*/ - @Resource(name = "taskService") + @Resource(name="taskService") private TaskService taskService; - @Resource(name = "stngBean") + @Resource(name="stngBean") private StngBean stngBean; /**계고장 발송 대상 자료 메인화면(sndb/sndb01/010-main)을 연다. @@ -196,7 +196,7 @@ public class Sndb01Controller extends ApplicationController { , Map.entry("단속법정동", "CRDN_STDG_NM") , Map.entry("단속장소", "CRDN_PLC") , Map.entry("상세단속장소", "DTL_CRDN_PLC") - , Map.entry("최초단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) + , Map.entry("단속금액", xlsx.style("FFNLG_CRDN_AMT", numeric)) , Map.entry("처리상태", "CRDN_STTS_NM") , Map.entry("납부자명", "RTPYR_NM") , Map.entry("납부자생일", xlsx.style("RTPYR_BRDT_MASK", center)) @@ -771,7 +771,7 @@ public class Sndb01Controller extends ApplicationController { , Map.entry("과태료금액", xlsx.style("FFNLG_AMT", numeric)) , Map.entry("본세", xlsx.style("PCPTAX", numeric)) , Map.entry("가산금", xlsx.style("ADAMT", numeric)) - , Map.entry("합계금액", xlsx.style("SUM_AMT", numeric)) + , Map.entry("미납금액", xlsx.style("SUM_AMT", numeric)) , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) @@ -956,7 +956,7 @@ public class Sndb01Controller extends ApplicationController { , Map.entry("과태료금액", xlsx.style("FFNLG_AMT", numeric)) , Map.entry("본세", xlsx.style("PCPTAX", numeric)) , Map.entry("가산금", xlsx.style("ADAMT", numeric)) - , Map.entry("합계금액", xlsx.style("SUM_AMT", numeric)) + , Map.entry("미납금액", xlsx.style("SUM_AMT", numeric)) , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) @@ -1416,7 +1416,7 @@ public class Sndb01Controller extends ApplicationController { , Map.entry("납기일자", xlsx.format(o -> xlsx.str2date(o.get("DUDT_YMD"))).style(dateYMD)) , Map.entry("본세", xlsx.style("PCPTAX", numeric)) , Map.entry("가산금", xlsx.style("ADAMT", numeric)) - , Map.entry("합계금액", xlsx.style("SUM_AMT", numeric)) + , Map.entry("미납금액", xlsx.style("SUM_AMT", numeric)) , Map.entry("등록일시", xlsx.format(o -> xlsx.str2datetime(o.get("REG_DT"))).style(dateDT)) , Map.entry("등록사용자", xlsx.style("RGTR_NM", center)) , Map.entry("수정일시", xlsx.format(o -> xlsx.str2datetime(o.get("MDFCN_DT"))).style(dateDT)) 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 e50089cb..385d1bb0 100644 --- a/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/crdnReReg-mapper.xml @@ -68,8 +68,8 @@ , P.ZIP , P.ADDR , P.DTL_ADDR - , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM - , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL) AS RTPYR_BRDT_MASK + , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK FROM TB_CRDN_RE_REG CRR INNER JOIN TB_CRDN C ON (CRR.CRDN_ID = C.CRDN_ID) INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) 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 a21c2c32..03decd1f 100644 --- a/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/levyExcl-mapper.xml @@ -38,9 +38,9 @@ , LE.DEL_DT , (SELECT GET_CODE_NM('FIM021', LE.LEVY_EXCL_SE_CD) FROM DUAL) AS LEVY_EXCL_SE_NM , (SELECT GET_CODE_NM('FIM022', LE.LEVY_EXCL_RSN_CD) FROM DUAL) AS LEVY_EXCL_RSN_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.RGTR) AS RGTR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.MDFR) AS MDFR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.DLTR) AS DLTR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.RGTR) AS RGTR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.MDFR) AS MDFR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.DLTR) AS DLTR_NM , C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD @@ -70,8 +70,8 @@ , P.ZIP , P.ADDR , P.DTL_ADDR - , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM - , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL) AS RTPYR_BRDT_MASK + , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK , CC.CVLCPT_LINK_ID , CC.CVLCPT_RCPT_YMD , CC.CVLCPT_APLY_NO @@ -193,32 +193,31 @@ - SELECT LE.LEVY_EXCL_ID - , LE.LEVY_EXCL_YMD - , LE.LEVY_EXCL_SE_CD - , LE.LEVY_EXCL_RSN_CD - , LE.ETC_CN - , LE.DEL_YN - , LE.REG_DT - , LE.RGTR - , LE.MDFCN_DT - , LE.MDFR - , LE.DEL_DT - , LE.DLTR - , LE.DEL_RSN + SELECT LE.LEVY_EXCL_ID + , LE.LEVY_EXCL_YMD + , LE.LEVY_EXCL_SE_CD + , LE.LEVY_EXCL_RSN_CD + , LE.ETC_CN + , LE.DEL_YN + , LE.REG_DT + , LE.RGTR + , LE.MDFCN_DT + , LE.MDFR + , LE.DEL_DT + , LE.DLTR , (SELECT GET_CODE_NM('FIM021', LE.LEVY_EXCL_SE_CD) FROM DUAL) AS LEVY_EXCL_SE_NM , (SELECT GET_CODE_NM('FIM022', LE.LEVY_EXCL_RSN_CD) FROM DUAL) AS LEVY_EXCL_RSN_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.RGTR) AS RGTR_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.MDFR) AS MDFR_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LE.DLTR) AS DLTR_NM - , C.CRDN_ID - , C.SGG_CD - , C.TASK_SE_CD - , C.VHRNO - , C.CRDN_STTS_CD - , C.CRDN_STTS_CHG_DT + , C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD + , C.VHRNO + , C.CRDN_STTS_CD + , C.CRDN_STTS_CHG_DT , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM FROM TB_LEVY_EXCL LE INNER JOIN TB_CRDN C ON (LE.CRDN_ID = C.CRDN_ID) 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 99559ac6..9545a071 100644 --- a/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml +++ b/src/main/resources/sql/mapper/fims/excl/opnnSbmsn-mapper.xml @@ -77,10 +77,10 @@ , OS.REG_DT , OS.MDFCN_DT , OS.DEL_DT - , (CONCAT(OS.ANS_YMD, OS.ANS_TM)) AS ANS_YMD_TM + , (CONCAT(OS.ANS_YMD, OS.ANS_TM)) AS ANS_YMD_TM + , (GET_BRDT_FORMAT(OS.STTR_BRDT, '.')) AS STTR_BRDT_MASK , (SELECT GET_CODE_NM('FIM029', OS.RCPT_SE_CD) FROM DUAL) AS RCPT_SE_NM , (SELECT GET_CODE_NM('FIM032', OS.OWNR_REL_CD) FROM DUAL) AS OWNR_REL_NM - , (SELECT GET_BRDT_FORMAT(OS.STTR_BRDT, '.') FROM DUAL) AS STTR_BRDT_MASK , (SELECT GET_CODE_NM('FIM033', OS.OPNN_SBMSN_SE_CD) FROM DUAL) AS OPNN_SBMSN_SE_NM , (SELECT GET_CODE_NM('FIM030', OS.NTFCTN_SE_CD) FROM DUAL) AS NTFCTN_SE_NM , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM @@ -118,13 +118,13 @@ , P.ZIP , P.ADDR , P.DTL_ADDR - , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM - , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL) AS RTPYR_BRDT_MASK + , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK , 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') - END ) AS RDUCT_AMT + END ) AS RDUCT_AMT FROM TB_OPNN_SBMSN OS INNER JOIN TB_CRDN C ON (OS.CRDN_ID = C.CRDN_ID) INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) @@ -281,10 +281,10 @@ , OS.DEL_DT , OS.DLTR , OS.DEL_RSN - , (CONCAT(OS.ANS_YMD, OS.ANS_TM)) AS ANS_YMD_TM + , (CONCAT(OS.ANS_YMD, OS.ANS_TM)) AS ANS_YMD_TM + , (GET_BRDT_FORMAT(OS.STTR_BRDT, '.')) AS STTR_BRDT_MASK , (SELECT GET_CODE_NM('FIM029', OS.RCPT_SE_CD) FROM DUAL) AS RCPT_SE_NM , (SELECT GET_CODE_NM('FIM032', OS.OWNR_REL_CD) FROM DUAL) AS OWNR_REL_NM - , (SELECT GET_BRDT_FORMAT(OS.STTR_BRDT, '-') FROM DUAL) AS STTR_BRDT_FORMAT , (SELECT GET_CODE_NM('FIM033', OS.OPNN_SBMSN_SE_CD) FROM DUAL) AS OPNN_SBMSN_SE_NM , (SELECT GET_CODE_NM('FIM030', OS.NTFCTN_SE_CD) FROM DUAL) AS NTFCTN_SE_NM , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM @@ -355,11 +355,11 @@ , OS.NTFCTN_SE_CD , OS.PIC_RVW_OPNN , OS.OPNN_SBMSN_STTS_CD + , (GET_BRDT_FORMAT(OS.STTR_BRDT, '.')) AS STTR_BRDT_MASK + , (GET_MASK_DATE(OS.RCPT_YMD, '-')) AS RCPT_YMD_MASK + , (CONCAT(OS.STTR_ADDR, ' ', OS.STTR_DADDR)) AS STTR_WHOL_ADDR , (CONCAT(SUBSTR(OS.RCPT_NO,1,4), '-', SUBSTR(OS.RCPT_NO,5,6))) AS RCPT_NO_MASK - , (SELECT GET_MASK_DATE(OS.RCPT_YMD, '-') FROM DUAL) AS RCPT_YMD_MASK , (SELECT GET_CODE_NM('FIM032', OS.OWNR_REL_CD) FROM DUAL) AS OWNR_REL_NM - , (SELECT GET_BRDT_FORMAT(OS.STTR_BRDT, '.') FROM DUAL) AS STTR_BRDT_FORMAT - , (CONCAT(OS.STTR_ADDR, ' ', OS.STTR_DADDR)) AS STTR_WHOL_ADDR , (SELECT GET_CODE_NM('FIM033', OS.OPNN_SBMSN_SE_CD) FROM DUAL) AS OPNN_SBMSN_SE_NM , (SELECT GET_CODE_NM('FIM031', OS.OPNN_SBMSN_STTS_CD) FROM DUAL) AS OPNN_SBMSN_STTS_NM , C.CRDN_ID @@ -373,9 +373,9 @@ , C.FFNLG_AMT , C.CRDN_STTS_CD , C.CRDN_STTS_CHG_DT - , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM - , (SELECT GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':') FROM DUAL) AS CRDN_YMD_TM_MASK - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , (GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':')) AS CRDN_YMD_TM_MASK + , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM + , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , DLBR_MBR_JBGD1 , DLBR_MBR_NM1 , DLBR_MBR_JBGD2 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 c43272d0..452eeaff 100644 --- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml @@ -134,7 +134,7 @@ , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.RGTR) AS RGTR_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.MDFR) AS MDFR_NM - , (SELECT GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':') FROM DUAL) AS CRDN_YMD_TM_MASK + , (GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':')) AS CRDN_YMD_TM_MASK , V.VLTN_ID , V.VLTN_CD , V.VLTN_ARTCL @@ -147,8 +147,8 @@ , CC.CVLCPT_PRCS_CMPTN_DT , CC.CVLCPT_TRSM_CD , CC.CVLCPT_TRSM_DT - , (SELECT GET_CODE_NM('FIM017', CC.CVLCPT_PRCS_CD) FROM DUAL) AS CVLCPT_PRCS_NM - , (SELECT GET_CODE_NM('FIM018', CC.CVLCPT_TRSM_CD) FROM DUAL) AS CVLCPT_TRSM_NM + , (SELECT GET_CODE_NM('FIM017', CC.CVLCPT_PRCS_CD) FROM DUAL) AS CVLCPT_PRCS_NM + , (SELECT GET_CODE_NM('FIM018', CC.CVLCPT_TRSM_CD) FROM DUAL) AS CVLCPT_TRSM_NM , P.RTPYR_ID , P.RTPYR_SE_CD , P.RTPYR_NO @@ -157,8 +157,8 @@ , P.ZIP , P.ADDR , P.DTL_ADDR - , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM - , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL) AS RTPYR_BRDT_MASK + , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK , L.LEVY_ID FROM TB_CRDN C INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) @@ -391,7 +391,7 @@ , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM - , (SELECT GET_MASK_DATETIME(C.CRDN_YMD,'-',C.CRDN_TM,':') FROM DUAL) AS CRDN_YMD_TM_MASK + , (GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':')) AS CRDN_YMD_TM_MASK , V.VLTN_ID , V.VLTN_CD , V.VLTN_ARTCL @@ -403,8 +403,8 @@ , P.ZIP , P.ADDR , P.DTL_ADDR - , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM - , (SELECT GET_BRDT_FORMAT(P.RTPYR_BRDT, '.') FROM DUAL) AS RTPYR_BRDT_MASK + , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK FROM TB_LEVY L INNER JOIN TB_CRDN C ON (L.CRDN_ID = C.CRDN_ID) INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) @@ -982,8 +982,8 @@ , C.ADTN_AMT , C.MINUS_AMT , C.RCVMT_AMT - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM - , (SELECT GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':') FROM DUAL) AS CRDN_YMD_TM_MASK + , (GET_MASK_DATETIME(C.CRDN_YMD, '-', C.CRDN_TM, ':')) AS CRDN_YMD_TM_MASK + , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , V.VLTN_CD , V.VLTN_ARTCL , V.VLTN_LAW_NM @@ -998,7 +998,7 @@ , P.RTPYR_NO , P.RTPYR_NM , P.RTPYR_STTS_CD - , (SELECT GET_CODE_NM('FIM014', P.RTPYR_STTS_CD) FROM DUAL) AS RTPYR_STTS_NM + , (SELECT GET_CODE_NM('FIM014', P.RTPYR_STTS_CD) FROM DUAL) AS RTPYR_STTS_NM , L.LEVY_ID , AS TODAY FROM TB_CRDN C 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 0349076f..5c323246 100644 --- a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml +++ b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml @@ -26,102 +26,162 @@ - SELECT R.RDUCT_ID - , R.RDUCT_YMD - , R.RDUCT_RSN_CD - , R.RDUCT_AMT - , R.ETC_CN - , R.DEL_YN - , R.REG_DT - , R.RGTR - , R.MDFCN_DT - , R.MDFR - , R.DEL_DT - , R.DLTR + SELECT R.RDUCT_ID + , R.RDUCT_YMD + , R.RDUCT_RSN_CD + , R.RDUCT_AMT + , R.ETC_CN + , R.DEL_YN + , R.REG_DT + , R.RGTR + , R.MDFCN_DT + , R.MDFR + , R.DEL_DT + , R.DLTR , (SELECT GET_CODE_NM('FIM019', R.RDUCT_RSN_CD) FROM DUAL) AS RDUCT_RSN_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = R.RGTR) AS RGTR_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = R.MDFR) AS MDFR_NM , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = R.DLTR) AS DLTR_NM - , C.CRDN_ID - , C.SGG_CD - , C.TASK_SE_CD - , C.VHRNO - , C.FFNLG_CRDN_AMT - , C.FFNLG_RDUCT_RT - , C.FFNLG_AMT - , C.ADVNTCE_AMT - , C.CRDN_STTS_CD - , CONCAT(C.CRDN_YMD,C.CRDN_TM) AS CRDN_YMD_TM + , C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD + , C.VHRNO + , C.CRDN_STDG_NM + , C.CRDN_ROAD_NM + , C.CRDN_PLC + , C.FFNLG_CRDN_AMT + , C.FFNLG_RDUCT_RT + , C.FFNLG_AMT + , C.ADVNTCE_AMT + , C.CRDN_STTS_CD + , (CONCAT(C.CRDN_YMD,C.CRDN_TM)) AS CRDN_YMD_TM + , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM - , P.RTPYR_ID - , P.RTPYR_NO - , P.RTPYR_NM - , L.LEVY_ID - , L.LEVY_PCPTAX - , L.LEVY_ADAMT - , L.INSPY_INT - , L.RCVMT_PCPTAX - , L.RCVMT_ADAMT - , L.RDCAMT_PCPTAX - , L.RDCAMT_ADAMT - , L.SUM_AMT + , CA.CRDN_SE_CD + , CA.CRDN_SPAREA_CD + , CA.PARKNG_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 + , P.RTPYR_ID + , P.RTPYR_SE_CD + , P.RTPYR_NO + , P.RTPYR_NM + , P.ZIP + , P.ADDR + , P.DTL_ADDR + , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (GET_BRDT_FORMAT(P.RTPYR_BRDT, '.')) AS RTPYR_BRDT_MASK + , L.LEVY_ID + , L.LEVY_PCPTAX + , L.LEVY_ADAMT + , L.INSPY_INT + , L.RCVMT_PCPTAX + , L.RCVMT_ADAMT + , L.RDCAMT_PCPTAX + , L.RDCAMT_ADAMT + , L.SUM_AMT , L.LEVY_PCPTAX + L.LEVY_ADAMT AS LEVY_AMT , L.RCVMT_PCPTAX + L.RCVMT_ADAMT AS RCVMT_AMT , L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT AS RDCAMT_AMT FROM TB_RDUCT R - INNER JOIN TB_CRDN C ON (R.CRDN_ID = C.CRDN_ID) - LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) - LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') + INNER JOIN TB_CRDN C ON (R.CRDN_ID = C.CRDN_ID) + INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) + LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) + LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') @@ -136,7 +196,7 @@ , C.FFNLG_AMT , C.ADVNTCE_AMT , C.CRDN_STTS_CD - , CONCAT(C.CRDN_YMD,C.CRDN_TM) AS CRDN_YMD_TM + , (CONCAT(C.CRDN_YMD,C.CRDN_TM)) AS CRDN_YMD_TM , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM , L.LEVY_ID , L.SUM_AMT @@ -172,11 +232,11 @@ - AND C.CRDN_ID = #{crdnId} - AND C.DEL_YN = 'N' + AND C.CRDN_ID = #{crdnId} + AND C.DEL_YN = 'N' - AND R.RDUCT_ID = #{rductId} + AND R.RDUCT_ID = #{rductId} diff --git a/src/main/resources/sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml b/src/main/resources/sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml index cc666276..5c89493b 100644 --- a/src/main/resources/sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml +++ b/src/main/resources/sql/mapper/fims/nxrp/nxrpMtchg-mapper.xml @@ -125,59 +125,59 @@ /* 발송 상세 등록(sndngDtlMapper.insertSndngDtl) */ @@ -797,15 +797,15 @@ , SD.MDFR , SD.DEL_DT , SD.DLTR - , CONCAT(SD.FYR, '-', SD.LEVY_NO) AS GOJI_NO - , (SELECT GET_MASK_DATE(SD.DUDT_YMD, '.') FROM DUAL) AS DUDT_YMD_MASK - , (SELECT GET_MASK_DATE(SD.DUDT_YMD, 'K') FROM DUAL) AS DUDT_YMD_MASK_KOR + , (CONCAT(SD.FYR, '-', SD.LEVY_NO)) AS GOJI_NO + , (GET_MASK_DATE(SD.DUDT_YMD, '.')) AS DUDT_YMD_MASK + , (GET_MASK_DATE(SD.DUDT_YMD, 'K')) AS DUDT_YMD_MASK_KOR , (SELECT GET_CODE_NM('FIM047', SD.SNDNG_SE_CD) FROM DUAL) AS SNDNG_SE_NM , (SELECT GET_CODE_NM('FIM050', SD.SNDNG_DTL_STTS_CD) FROM DUAL) AS SNDNG_DTL_STTS_NM , (SELECT GET_CODE_NM('FIM051', SD.SNDNG_RCVMT_CD) FROM DUAL) AS SNDNG_RCVMT_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = SD.RGTR) AS RGTR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = SD.MDFR) AS MDFR_NM - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = SD.DLTR) AS DLTR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = SD.RGTR) AS RGTR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = SD.MDFR) AS MDFR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = SD.DLTR) AS DLTR_NM , C.CRDN_ID , C.SGG_CD , C.TASK_SE_CD @@ -818,7 +818,7 @@ , C.CRDN_ROAD_NM , C.CRDN_PLC , C.CRDN_STTS_CD - , CONCAT(C.CRDN_YMD, C.CRDN_TM) AS CRDN_YMD_TM + , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM , (SELECT GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) FROM DUAL) AS CRDN_REG_SE_NM , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM diff --git a/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml index 06091d68..9d2cdca5 100644 --- a/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sndb/svbtc-mapper.xml @@ -199,9 +199,9 @@ , SD.SNDNG_DTL_STTS_CD , SD.SNDNG_RCVMT_CD , SD.ADDR_CHG_CD - , (SELECT GET_MASK_DATE(SD.LEVY_YMD, '.') FROM DUAL) AS LEVY_YMD_MASK - , (SELECT GET_MASK_DATE(SD.DUDT_YMD, '.') FROM DUAL) AS DUDT_YMD_MASK - , (SELECT GET_MASK_DATE(SD.DUDT_YMD, 'K') FROM DUAL) AS DUDT_YMD_MASK_KOR + , (GET_MASK_DATE(SD.LEVY_YMD, '.')) AS LEVY_YMD_MASK + , (GET_MASK_DATE(SD.DUDT_YMD, '.')) AS DUDT_YMD_MASK + , (GET_MASK_DATE(SD.DUDT_YMD, 'K')) AS DUDT_YMD_MASK_KOR , (SELECT GET_CODE('EGP010', SD.UNDLVR_RSN_NM) FROM DUAL) AS UNDLVR_RSN_CD , (SELECT GET_CODE_NM('FIM050', SD.SNDNG_DTL_STTS_CD) FROM DUAL) AS SNDNG_DTL_STTS_NM , (SELECT GET_CODE_NM('FIM051', SD.SNDNG_RCVMT_CD) FROM DUAL) AS SNDNG_RCVMT_NM @@ -262,8 +262,8 @@ , SV.TTL_NM , SV.ETC_CN , SV.TNOCS - , (SELECT GET_MASK_DATE(SV.SVBTC_YMD, '-') FROM DUAL) AS SVBTC_YMD - , (SELECT GET_MASK_DATE(SV.SVBTC_END_YMD, '-') FROM DUAL) AS SVBTC_END_YMD + , (GET_MASK_DATE(SV.SVBTC_YMD, '-')) AS SVBTC_YMD + , (GET_MASK_DATE(SV.SVBTC_END_YMD, '-')) AS SVBTC_END_YMD , SD.SNDNG_DTL_ID , SD.SNDNG_ID , SD.CRDN_ID @@ -281,17 +281,17 @@ , SD.UNDLVR_RSN_NM , SD.ACTL_RCPN_NM , SD.RCPN_REL_NM - , (SELECT GET_MASK_NAME(SD.RCPN_NM, 'MIDDLE', 2, '*') FROM DUAL) AS RCPN_NM_MASK - , REGEXP_REPLACE(CONCAT(SD.RCPN_ADDR, ' ', SD.RCPN_DTL_ADDR), '[0-9]', '*') AS WHOL_ADDR_MASK - , CONCAT(SUBSTRING(SD.VHRNO, 1, CHAR_LENGTH(SD.VHRNO) - 2), '**') AS VHRNO_MASK - , (SELECT GET_MASK_DATE(SD.DLVR_YMD, '-') FROM DUAL) AS DLVR_YMD_MASK - , (SELECT GET_INST_LEADER(S.INST_NM, S.INST_SE_CD) FROM DUAL) AS INST_LEADER + , (GET_MASK_DATE(SD.DLVR_YMD, '-')) AS DLVR_YMD_MASK + , (GET_MASK_NAME(SD.RCPN_NM, 'MIDDLE', 2, '*')) AS RCPN_NM_MASK + , (REGEXP_REPLACE(CONCAT(SD.RCPN_ADDR, ' ', SD.RCPN_DTL_ADDR), '[0-9]', '*')) AS WHOL_ADDR_MASK + , (CONCAT(SUBSTRING(SD.VHRNO, 1, CHAR_LENGTH(SD.VHRNO) - 2), '**')) AS VHRNO_MASK + , (GET_INST_LEADER(S.INST_NM, S.INST_SE_CD)) AS INST_LEADER , OFFCS_FILE_PATH , DEPT_TELNO - , CONCAT(SGG_NM, ' ', DEPT_NM) AS SGG_DEPT_NM - , #{printDocNo} AS INPUT_DOC_NO - , #{printTtlNm} AS INPUT_TTL_NM - , #{printSvbtcDate} AS INPUT_SVBTC_DATE + , (CONCAT(SGG_NM, ' ', DEPT_NM)) AS SGG_DEPT_NM + , #{printDocNo} AS INPUT_DOC_NO + , #{printTtlNm} AS INPUT_TTL_NM + , #{printSvbtcDate} AS INPUT_SVBTC_DATE FROM TB_SVBTC SV INNER JOIN TB_SNDNG_DTL SD ON (SV.SVBTC_ID = SD.SVBTC_ID) INNER JOIN TB_SGG S ON (SV.SGG_CD = S.SGG_CD AND S.SGG_CD = #{sggCd}) 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 703562ca..aae978a5 100644 --- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml @@ -8,120 +8,120 @@ ============================ --> - SELECT C.CRDN_ID - , C.SGG_CD - , C.TASK_SE_CD - , C.RTPYR_ID - , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM - , C.VHRNO - , C.CRDN_STTS_CD - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM - , C.CRDN_STTS_CHG_DT - , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO - FROM TB_CRDN C - LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') + SELECT C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD + , C.RTPYR_ID + , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM + , C.VHRNO + , C.CRDN_STTS_CD + , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , C.CRDN_STTS_CHG_DT + , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO + FROM TB_CRDN C + LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') - SELECT C.CRDN_ID - , C.SGG_CD - , C.TASK_SE_CD - , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM - , C.CRDN_REG_SE_CD - , (SELECT GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) FROM DUAL) AS CRDN_REG_SE_NM - , C.CRDN_INPT_SE_CD - , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM - , C.CVLCPT_LINK_YN - , C.LINK_TBL_NM - , C.LINK_ID - , C.CRDN_YMD - , C.CRDN_TM - , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_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.FFNLG_AMT - , C.ADVNTCE_BGNG_YMD - , C.ADVNTCE_DUDT_YMD - , C.ADVNTCE_AMT - , C.OPNN_SBMSN_YN - , C.ETC_CN - , C.CRDN_STTS_CD - , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM - , C.CRDN_STTS_CHG_DT - , C.BFR_CRDN_ID - , C.DEL_YN - , C.REG_DT - , C.RGTR - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.RGTR) AS RGTR_NM - , C.MDFCN_DT - , C.MDFR - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.MDFR) AS MDFR_NM - , C.DEL_DT - , C.DLTR - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.DLTR) AS DLTR_NM - , C.DEL_RSN - , CA.CRDN_SE_CD - , (SELECT GET_CODE_NM('FIM002', CA.CRDN_SE_CD) FROM DUAL) AS CRDN_SE_NM - , CA.TEAM_ID - , CA.DTL_CRDN_PLC - , CA.CRDN_SPAREA_CD - , (SELECT GET_CODE_NM('FIM007', CA.CRDN_SPAREA_CD) FROM DUAL) AS CRDN_SPAREA_NM - , CA.CRDN_BGNG_TM - , CA.CRDN_END_TM - , CA.CRDN_SN - , CA.MOSC_X - , CA.MOSC_Y - , CA.TOWNG_YN - , (SELECT GET_CODE_NM('FIM006', CA.TOWNG_YN) FROM DUAL) AS TOWNG_YN_NM - , CA.USE_FUEL_CD - , (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.VLTN_NMTM - , CA.OVTIME_YN - , (SELECT GET_CODE_NM('FIM006', CA.OVTIME_YN) FROM DUAL) AS OVTIME_YN_NM - , CA.OVTIME_PRTTN_YN - , (SELECT GET_CODE_NM('FIM006', CA.OVTIME_PRTTN_YN) FROM DUAL) AS OVTIME_PRTTN_YN_NM - , V.TXITM_NM - , V.OPER_ITEM_NM - , P.RTPYR_ID - , P.RTPYR_INPT_SE_CD - , (SELECT GET_CODE_NM('FIM015', P.RTPYR_INPT_SE_CD) FROM DUAL) AS RTPYR_INPT_SE_NM - , P.RTPYR_SE_CD - , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM - , P.RTPYR_NO - , P.RTPYR_NM - , P.RTPYR_TELNO - , P.RTPYR_MBL_TELNO - , P.RTPYR_EML - , P.RTPYR_STTS_CD - , (SELECT GET_CODE_NM('FIM014', P.RTPYR_STTS_CD) FROM DUAL) AS RTPYR_STTS_NM - , P.ADDR_SE_CD - , (SELECT GET_CODE_NM('FIM013', P.ADDR_SE_CD) FROM DUAL) AS ADDR_SE_NM - , P.ZIP - , P.ADDR - , P.DTL_ADDR - , P.WHOL_ADDR - , P.MDFCN_DT AS P_MDFCN_DT - , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = P.MDFR) AS P_MDFR_NM + SELECT C.CRDN_ID + , C.SGG_CD + , C.TASK_SE_CD + , C.CRDN_REG_SE_CD + , C.CRDN_INPT_SE_CD + , C.CVLCPT_LINK_YN + , C.LINK_TBL_NM + , C.LINK_ID + , 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.FFNLG_AMT + , C.ADVNTCE_BGNG_YMD + , C.ADVNTCE_DUDT_YMD + , C.ADVNTCE_AMT + , C.OPNN_SBMSN_YN + , C.ETC_CN + , C.CRDN_STTS_CD + , C.CRDN_STTS_CHG_DT + , C.BFR_CRDN_ID + , C.DEL_YN + , C.REG_DT + , C.RGTR + , C.MDFCN_DT + , C.MDFR + , C.DEL_DT + , C.DLTR + , C.DEL_RSN + , (CONCAT(C.CRDN_YMD, C.CRDN_TM)) AS CRDN_YMD_TM + , (SELECT GET_CODE_NM('FIM054', C.TASK_SE_CD) FROM DUAL) AS TASK_SE_NM + , (SELECT GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) FROM DUAL) AS CRDN_REG_SE_NM + , (SELECT GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) FROM DUAL) AS CRDN_INPT_SE_NM + , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL) AS CRDN_STTS_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.RGTR) AS RGTR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.MDFR) AS MDFR_NM + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = C.DLTR) AS DLTR_NM + , CA.CRDN_SE_CD + , CA.TEAM_ID + , CA.DTL_CRDN_PLC + , CA.CRDN_SPAREA_CD + , CA.CRDN_BGNG_TM + , CA.CRDN_END_TM + , CA.CRDN_SN + , CA.MOSC_X + , CA.MOSC_Y + , CA.TOWNG_YN + , CA.USE_FUEL_CD + , CA.FFNLG_CARMDL_CD + , CA.PARKNG_PSBLTY_RSLT_CD + , CA.VLTN_NMTM + , CA.OVTIME_YN + , CA.OVTIME_PRTTN_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('FIM006', CA.TOWNG_YN) FROM DUAL) AS TOWNG_YN_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('FIM006', CA.OVTIME_YN) FROM DUAL) AS OVTIME_YN_NM + , (SELECT GET_CODE_NM('FIM006', CA.OVTIME_PRTTN_YN) FROM DUAL) AS OVTIME_PRTTN_YN_NM + , V.TXITM_NM + , V.OPER_ITEM_NM + , P.RTPYR_ID + , P.RTPYR_INPT_SE_CD + , P.RTPYR_SE_CD + , P.RTPYR_NO + , P.RTPYR_NM + , P.RTPYR_TELNO + , P.RTPYR_MBL_TELNO + , P.RTPYR_EML + , P.RTPYR_STTS_CD + , P.ADDR_SE_CD + , P.ZIP + , P.ADDR + , P.DTL_ADDR + , P.WHOL_ADDR + , (SELECT GET_CODE_NM('FIM015', P.RTPYR_INPT_SE_CD) FROM DUAL) AS RTPYR_INPT_SE_NM + , (SELECT GET_CODE_NM('FIM011', P.RTPYR_SE_CD) FROM DUAL) AS RTPYR_SE_NM + , (SELECT GET_CODE_NM('FIM014', P.RTPYR_STTS_CD) FROM DUAL) AS RTPYR_STTS_NM + , (SELECT GET_CODE_NM('FIM013', P.ADDR_SE_CD) FROM DUAL) AS ADDR_SE_NM + , P.MDFCN_DT AS P_MDFCN_DT + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = P.MDFR) AS P_MDFR_NM , CC.CVLCPT_LINK_ID , CC.CVLCPT_APLY_SE_CD , CC.DSTRBNC_YN @@ -141,27 +141,27 @@ , CC.CVLCPT_PRCS_RSLT_CN , CC.CVLCPT_PRCS_CMPTN_DT , CC.CVLCPT_PRCS_PIC - , L.LEVY_ID - , L.INST_CD - , L.DEPT_CD - , L.SPCL_BIZ_CD - , L.FYR - , L.ACNTG_SE_CD - , L.TXITM_CD - , L.LEVY_NO - , L.INSPY_NO - , L.LEVY_PCPTAX - , L.LEVY_ADAMT - , L.INSPY_INT - , L.RCVMT_PCPTAX - , L.RCVMT_ADAMT - , L.RDCAMT_PCPTAX - , L.RDCAMT_ADAMT - , L.SUM_AMT - , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO - , L.LEVY_PCPTAX + L.LEVY_ADAMT + L.INSPY_INT AS LEVY_AMT - , L.RCVMT_PCPTAX + L.RCVMT_ADAMT AS RCVMT_AMT - , L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT AS RDCAMT_AMT + , L.LEVY_ID + , L.INST_CD + , L.DEPT_CD + , L.SPCL_BIZ_CD + , L.FYR + , L.ACNTG_SE_CD + , L.TXITM_CD + , L.LEVY_NO + , L.INSPY_NO + , L.LEVY_PCPTAX + , L.LEVY_ADAMT + , L.INSPY_INT + , L.RCVMT_PCPTAX + , L.RCVMT_ADAMT + , L.RDCAMT_PCPTAX + , L.RDCAMT_ADAMT + , L.SUM_AMT + , (CONCAT(L.FYR, '-', L.LEVY_NO)) AS GOJI_NO + , (L.LEVY_PCPTAX + L.LEVY_ADAMT + L.INSPY_INT) AS LEVY_AMT + , (L.RCVMT_PCPTAX + L.RCVMT_ADAMT) AS RCVMT_AMT + , (L.RDCAMT_PCPTAX + L.RDCAMT_ADAMT) AS RDCAMT_AMT FROM TB_CRDN C INNER JOIN TB_CRDN_ADI CA ON (C.CRDN_ID = CA.CRDN_ID) INNER JOIN TB_VLTN V ON (C.VLTN_ID = V.VLTN_ID) diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp index de1df458..95aa3630 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02010-main.jsp @@ -146,8 +146,8 @@ - NO. - + No. + 업무구분 발송구분 최종사용일시 diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp index fd6a73ee..d95f63dc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02030-main.jsp @@ -44,7 +44,7 @@ @@ -235,8 +235,8 @@ - NO. - + No. + 발송일자 발송내역 취급구분 diff --git a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02050-main.jsp index 87634bbf..380921f7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/epst/epst02050-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/epst/epst02050-main.jsp @@ -44,7 +44,7 @@ @@ -142,7 +142,7 @@ - NO. + No. 발송자료키 우편물코드 우편물종류 diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index e11562dc..a31d80b5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -144,8 +144,8 @@ - - + +
@@ -183,8 +183,8 @@