diff --git a/src/main/java/cokr/xit/fims/rent/service/bean/LsctBean.java b/src/main/java/cokr/xit/fims/rent/service/bean/LsctBean.java index e2d60e70..b5276cb9 100644 --- a/src/main/java/cokr/xit/fims/rent/service/bean/LsctBean.java +++ b/src/main/java/cokr/xit/fims/rent/service/bean/LsctBean.java @@ -50,6 +50,7 @@ public class LsctBean extends AbstractBean { private PayerBean payerBean; /**지정한 조건에 따라 임대차계약 대장 목록을 조회하여 반환한다. + * 통합플랫폼으로 사용하지 안을 경우 렌트 소스만 사용하기 위해서 TB_CRDN, TB_PAYER에 직접 등록한다. * @param req 임대차계약 대장 조회 조건 * @return 임대차계약 대장 목록 */ @@ -57,11 +58,12 @@ public class LsctBean extends AbstractBean { // 기존 과태료 시스템에서 사용하던 암/복호화 함수 사용을 위해서.. XitAria crypto = new XitAria("xit-aria"); - // 연계 View 테이블 조회 + // 임대기업번호 암호화 if (req.getSchEntNo() != null && !req.getSchEntNo().equals("")) { req.setOmJno(crypto.encrypt(req.getSchEntNo())); } + // 연계 View 테이블 조회 List mainList = lsctMapper.selectMainList(req); if (mainList.size() > 0) { @@ -215,7 +217,8 @@ public class LsctBean extends AbstractBean { // 단속(TB_CRDN) 자료 조회 if (req.getSchEntNos() != null) { - req.setRtpyrNos(req.getSchEntNos()); +// 잠시 대기.. 한실장님 확인중 +// req.setRtpyrNos(req.getSchEntNos()); } if (req.getSchEntNo() != null) { req.setRtpyrNo(req.getSchEntNo()); diff --git a/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java b/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java index 0cd087a4..4bf76554 100644 --- a/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java +++ b/src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java @@ -123,14 +123,28 @@ public class Rent02Controller extends ApplicationController { XLSWriter xlsx = new XLSWriter().worksheet(0); Format format = new Format(xlsx); CellStyle center = format.cellStyle(Style.CENTER); + CellStyle numeric = format.n_nn0(); CellStyle dateDT = format.yyyy_mm_dd_hh_mm_ss(); List list = lsctService.getLsctList(req.setFetchSize(0)); Map valueMap = new HashMap(); + valueMap.put("업무구분", format.of("TASK_SE_NM").style(center)); + valueMap.put("단속일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "CRDN_YMD_TM").style(dateDT)); + valueMap.put("차량번호", format.of("VHRNO")); + valueMap.put("납부자구분", format.of("RTPYR_SE_NM").style(center)); + valueMap.put("납부자번호", format.of("RTPYR_NO").style(center)); + valueMap.put("납부자명", format.of("RTPYR_NM")); + valueMap.put("위반항목", format.of("VLTN_ARTCL")); + valueMap.put("단속법정동", format.of("CRDN_STDG_NM").style(center)); + valueMap.put("단속장소", format.of("CRDN_PLC")); + valueMap.put("단속원금", format.of("FFNLG_CRDN_AMT").style(numeric)); + valueMap.put("처리상태", format.of("CRDN_STTS_NM")); 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)); + valueMap.put("수정사용자", format.of("MDFR_NM").style(center)); CellDef.setValues(cellDefs, valueMap); diff --git a/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml index 291287ec..75b82876 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml @@ -134,7 +134,7 @@ ) - AND OM_JNO = #{omJno} + AND OM_JNO = #{omJno} AND OM_NAME = #{schEntNm} @@ -162,46 +162,46 @@ INSERT INTO TB_CRDN ( CRDN_ID - , SGG_CD - , TASK_SE_CD - , CRDN_REG_SE_CD - , CRDN_INPT_SE_CD - , CVLCPT_LINK_YN - , LINK_TBL_NM - , LINK_ID - , RTPYR_ID - , ADDR_SN - , CRDN_YMD - , CRDN_TM - , VHRNO - , CRDN_STDG_NM - , CRDN_ROAD_NM - , CRDN_PLC - , VLTN_ID - , GPS_X - , GPS_Y - , ATCH_FILE_CNT - , VIN - , VHCL_NM - , VHCL_COLR - , FFNLG_CRDN_AMT - , FFNLG_RDCRT - , FFNLG_AMT - , ADVNTCE_BGNG_YMD - , ADVNTCE_DUDT_YMD - , ADVNTCE_AMT - , OPNN_SBMSN_YN - , ETC_CN - , CRDN_STTS_CD - , CRDN_STTS_CHG_DT - , ADTN_AMT - , MINUS_AMT - , RCVMT_AMT - , BFR_CRDN_ID - , NXRP_CRDN_LINK_YN - , NXRP_CRDN_LINK_USER_ID - , NXRP_CRDN_LINK_DT - , NXRP_ACB_KEY + , SGG_CD + , TASK_SE_CD + , CRDN_REG_SE_CD + , CRDN_INPT_SE_CD + , CVLCPT_LINK_YN + , LINK_TBL_NM + , LINK_ID + , RTPYR_ID + , ADDR_SN + , CRDN_YMD + , CRDN_TM + , VHRNO + , CRDN_STDG_NM + , CRDN_ROAD_NM + , CRDN_PLC + , VLTN_ID + , GPS_X + , GPS_Y + , ATCH_FILE_CNT + , VIN + , VHCL_NM + , VHCL_COLR + , FFNLG_CRDN_AMT + , FFNLG_RDCRT + , FFNLG_AMT + , ADVNTCE_BGNG_YMD + , ADVNTCE_DUDT_YMD + , ADVNTCE_AMT + , OPNN_SBMSN_YN + , ETC_CN + , CRDN_STTS_CD + , CRDN_STTS_CHG_DT + , ADTN_AMT + , MINUS_AMT + , RCVMT_AMT + , BFR_CRDN_ID + , NXRP_CRDN_LINK_YN + , NXRP_CRDN_LINK_USER_ID + , NXRP_CRDN_LINK_DT + , NXRP_ACB_KEY , DEL_YN , REG_DT , RGTR