diff --git a/src/main/java/cokr/xit/fims/rent/LsctAprv.java b/src/main/java/cokr/xit/fims/rent/LsctAprv.java index 1bed4863..75067168 100644 --- a/src/main/java/cokr/xit/fims/rent/LsctAprv.java +++ b/src/main/java/cokr/xit/fims/rent/LsctAprv.java @@ -268,9 +268,9 @@ public class LsctAprv extends AbstractEntity { private String rqstrNm; /** - * 변경 승인 상태 + * 변경 승인 상태 코드 */ - private String chgAprvStts; + private String chgAprvSttsCd; /** * 변경 승인 일시 diff --git a/src/main/java/cokr/xit/fims/rent/LsctMpng.java b/src/main/java/cokr/xit/fims/rent/LsctMpng.java index 3ae1858a..683e25a5 100644 --- a/src/main/java/cokr/xit/fims/rent/LsctMpng.java +++ b/src/main/java/cokr/xit/fims/rent/LsctMpng.java @@ -163,9 +163,9 @@ public class LsctMpng extends AbstractEntity { private String dmndRtrcnIp; /** - * 변경 승인 상태 + * 변경 승인 상태 코드 */ - private String chgAprvStts; + private String chgAprvSttsCd; /** * 변경 승인 일시 diff --git a/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java b/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java index 24e065c8..d7b848fb 100644 --- a/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java +++ b/src/main/java/cokr/xit/fims/rent/service/bean/LsctMpngBean.java @@ -98,7 +98,6 @@ public class LsctMpngBean extends AbstractBean { public String saveFfnlgMainList(RentQuery req) { // 변수 선언 int rtnNocs = -1; // 처리 결과 건수 - String rtnMsg = ""; // 처리 결과 메시지 // 기존 과태료 시스템에서 사용하던 암/복호화 함수 사용을 위해서.. XitAria crypto = new XitAria("xit-aria"); @@ -707,7 +706,7 @@ public class LsctMpngBean extends AbstractBean { // 변경 승인 여부를 확인 한다. for (DataObject lsctMpng: lsctMpngList) { - if (lsctMpng.string("CHG_DMND_YN").equals("Y") && lsctMpng.string("CHG_APRV_STTS").equals("RQ")) { + if (lsctMpng.string("CHG_DMND_YN").equals("Y") && lsctMpng.string("CHG_APRV_STTS_CD").equals("RQ")) { RentQuery lsctAprvReq = new RentQuery(); lsctAprvReq.setLsctLinkTblNm(lsctMpng.string("LSCT_LINK_TBL_NM")); lsctAprvReq.setAprvId(lsctMpng.string("LSCT_APRV_ID")); @@ -716,15 +715,15 @@ public class LsctMpngBean extends AbstractBean { DataObject lsctAprv = lsctAprvMapper.selectLsctAprvInfo(lsctAprvReq); - if (!lsctAprv.string("CHG_APRV_STTS").equals("")) { + if (!lsctAprv.string("CHG_APRV_STTS_CD").equals("")) { LsctMpng updtLsctMpng = new LsctMpng(); - updtLsctMpng.setLsctMpngId(lsctAprv.string("LSCT_MPNG_ID")); // 임대차계약 매핑 ID - updtLsctMpng.setChgAprvStts(lsctAprv.string("CHG_APRV_STTS")); // 변경 승인 상태 - updtLsctMpng.setChgAprvDt(lsctAprv.string("CHG_APRV_DT")); // 변경 승인 일시 - updtLsctMpng.setChgAutzrNm(lsctAprv.string("CHG_AUTZR_NM")); // 변경 승인자 명 - updtLsctMpng.setChgAprvRsn(lsctAprv.string("CHG_APRV_RSN")); // 변경 승인 사유 - updtLsctMpng.setChgAprvIp(lsctAprv.string("CHG_APRV_IP")); // 변경 승인 IP + updtLsctMpng.setLsctMpngId(lsctAprv.string("LSCT_MPNG_ID")); // 임대차계약 매핑 ID + updtLsctMpng.setChgAprvSttsCd(lsctAprv.string("CHG_APRV_STTS_CD")); // 변경 승인 상태 코드 + updtLsctMpng.setChgAprvDt(lsctAprv.string("CHG_APRV_DT")); // 변경 승인 일시 + updtLsctMpng.setChgAutzrNm(lsctAprv.string("CHG_AUTZR_NM")); // 변경 승인자 명 + updtLsctMpng.setChgAprvRsn(lsctAprv.string("CHG_APRV_RSN")); // 변경 승인 사유 + updtLsctMpng.setChgAprvIp(lsctAprv.string("CHG_APRV_IP")); // 변경 승인 IP rtnNocs = lsctMpngMapper.updateLsctMpngChgAprv(updtLsctMpng); if (rtnNocs < 1) { @@ -937,7 +936,7 @@ public class LsctMpngBean extends AbstractBean { lsctAprv.setDmndYmd(dmndDateTime.substring(0, 7)); // 요청 일자 lsctAprv.setDmndTm(dmndDateTime.substring(8, 14)); // 요청 시각 lsctAprv.setRqstrNm(fimsUser.getName()); // 요청자 명 - lsctAprv.setChgAprvStts("RQ"); // 변경 승인 상태 + lsctAprv.setChgAprvSttsCd("RQ"); // 변경 승인 상태 // 연계 테이블명 if (lsctMpngInfo.string("SGG_CD").equals("50110") && lsctMpngInfo.string("TASK_SE_CD").equals("ECA")) { @@ -963,7 +962,7 @@ public class LsctMpngBean extends AbstractBean { lsctMpng.setRqstrNm(fimsUser.getName()); // 요청자 명 lsctMpng.setRqstrId(fimsUser.getId()); // 요청자 ID lsctMpng.setDmndIp(lsctAprv.getChgDmndIp()); // 요청 IP - lsctMpng.setChgAprvStts(lsctAprv.getChgAprvStts()); // 변경 승인 상태 + lsctMpng.setChgAprvSttsCd(lsctAprv.getChgAprvSttsCd()); // 변경 승인 상태 lsctMpng.setLsctLinkTblNm(lsctAprv.getLsctLinkTblNm()); // 임대차계약 연계 테이블 명 lsctMpng.setLsctAprvId(lsctAprv.getAprvId()); // 임대차계약 승인 ID @@ -1003,8 +1002,8 @@ public class LsctMpngBean extends AbstractBean { rtnMsg = "[F] 작업 중 임대차계약 정보가 존재하지 않습니다."; return rtnMsg; } - // 임대차계약매핑 변경 승인 상태(CHG_APRV_STTS)가 '요청'이 아니라면 종료.. - if (!lsctMpngInfo.string("CHG_APRV_STTS").equals("RQ")) { + // 임대차계약매핑 변경 승인 상태(CHG_APRV_STTS_CD)가 '요청'이 아니라면 종료.. + if (!lsctMpngInfo.string("CHG_APRV_STTS_CD").equals("RQ")) { rtnMsg = "[F] 작업 중 임대차계약 승인상태가 '요청' 이 아닙니다."; return rtnMsg; } @@ -1030,8 +1029,8 @@ public class LsctMpngBean extends AbstractBean { rtnMsg = "[F] 작업 중 임대차계약 승인 요청 정보가 존재하지 않습니다."; return rtnMsg; } - // 임대차계약 승인 정보의 변경 승인 상태(CHG_APRV_STTS)가 '요청'이 아니라면 종료.. - if (!lsctAprvInfo.string("CHG_APRV_STTS").equals("RQ")) { + // 임대차계약 승인 정보의 변경 승인 상태(CHG_APRV_STTS_CD)가 '요청'이 아니라면 종료.. + if (!lsctAprvInfo.string("CHG_APRV_STTS_CD").equals("RQ")) { rtnMsg = "[F] 작업 중 임대차계약 승인 요청 정보의 승인상태가 '요청' 이 아닙니다."; return rtnMsg; } @@ -1043,7 +1042,7 @@ public class LsctMpngBean extends AbstractBean { lsctMpng.setDmndRtrcnUserNm(fimsUser.getName()); // 요청 취소 사용자 명 lsctMpng.setDmndRtrcnUserId(fimsUser.getId()); // 요청 취소 사용자 ID lsctMpng.setDmndRtrcnIp(lsctAprv.getChgDmndIp()); // 변경 요청 취소 IP - lsctMpng.setChgAprvStts(null); // 변경 승인 상태 + lsctMpng.setChgAprvSttsCd(null); // 변경 승인 상태 lsctMpng.setLsctLinkTblNm(null); // 임대차계약 연계 테이블 명 lsctMpng.setLsctAprvId(null); // 임대차계약 승인 ID @@ -1055,7 +1054,7 @@ public class LsctMpngBean extends AbstractBean { // DB Link는 트랜잭션이 안된다. update 건수도 확인이 안된다. // 임대차계약 승인(TB_LSCT_APRV) 대장을 삭제한다. lsctAprv.setAprvId(lsctAprvInfo.string("APRV_ID")); // 승인 ID - lsctAprv.setChgAprvStts("RT"); // 변경 승인 상태 + lsctAprv.setChgAprvSttsCd("RT"); // 변경 승인 상태 lsctAprvMapper.deleteLsctAprv(lsctAprv); diff --git a/src/main/java/cokr/xit/fims/rent/web/Rent03Controller.java b/src/main/java/cokr/xit/fims/rent/web/Rent03Controller.java index ef83ae18..455fd07e 100644 --- a/src/main/java/cokr/xit/fims/rent/web/Rent03Controller.java +++ b/src/main/java/cokr/xit/fims/rent/web/Rent03Controller.java @@ -135,14 +135,33 @@ public class Rent03Controller extends ApplicationController { valueMap.put("대상여부", format.of("TRGT_STTS_NM").style(center)); valueMap.put("단속일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "CRDN_DT").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("CRDN_STDG_NM").style(center)); valueMap.put("단속장소", format.of("CRDN_PLC")); valueMap.put("위반항목", format.of("VLTN_ARTCL")); valueMap.put("단속원금", format.of("FFNLG_CRDN_AMT").style(numeric)); + valueMap.put("미납금액", format.of("SUM_AMT").style(numeric)); valueMap.put("처리상태", format.of("CRDN_STTS_NM")); + valueMap.put("전자납부번호", format.of("EPAYNO_MASK").style(center)); + valueMap.put("은행명", format.of("BANK_NM").style(center)); + valueMap.put("가상계좌번호", format.of("VR_ACTNO").style(center)); + valueMap.put("은행명2", format.of("BANK_NM").style(center)); + valueMap.put("가상계좌번호2", format.of("VR_ACTNO").style(center)); + valueMap.put("은행명3", format.of("BANK_NM").style(center)); + valueMap.put("가상계좌번호3", format.of("VR_ACTNO").style(center)); + valueMap.put("은행명4", format.of("BANK_NM").style(center)); + valueMap.put("가상계좌번호4", format.of("VR_ACTNO").style(center)); + valueMap.put("은행명5", format.of("BANK_NM").style(center)); + valueMap.put("가상계좌번호5", format.of("VR_ACTNO").style(center)); + valueMap.put("기업명", format.of("ENT_NM")); + valueMap.put("기업등록번호", format.of("ENT_REG_NO").style(center)); + valueMap.put("계약시작일자", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "CTRT_BGNG_DT").style(dateDT)); + valueMap.put("계약종료일자", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "CTRT_END_DT").style(dateDT)); + valueMap.put("임차인구분", format.of("HIRER_SE_NM").style(center)); + valueMap.put("임차인명", format.of("HIRER_NM")); + valueMap.put("요청일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "DMND_DT").style(dateDT)); + valueMap.put("승인상태", format.of("CHG_APRV_STTS_NM").style(center)); + valueMap.put("승인일시", FormatMaker.yyyy_mm_dd_hh_mm_ss(format, "CHG_APRV_DT").style(dateDT)); 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)); @@ -150,12 +169,12 @@ public class Rent03Controller extends ApplicationController { CellDef.setValues(cellDefs, valueMap); - xlsx.cell(0, 0).value("임대차계약등록").value(center).merge(0, cellDefs.size() - 1) + xlsx.cell(0, 0).value("단속조회").value(center).merge(0, cellDefs.size() - 1) .cell(3, 0).rowValues(CellDef.header(cellDefs, () -> StyleMaker.headerStyle(xlsx))) .cell(4, 0).values(list, CellDef.values(cellDefs.stream().map(i -> { if(i.getValue() instanceof Format) { i.setField(null); }; return i; }).toList())); return new ModelAndView("downloadView") - .addObject("download", xlsx.getDownloadable().setFilename("임대차계약등록" + "_목록_" + dateTime + ".xlsx")); + .addObject("download", xlsx.getDownloadable().setFilename("단속" + "_목록_" + dateTime + ".xlsx")); } } diff --git a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml index aa52f116..3fb98cb2 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctAprv-mapper.xml @@ -59,7 +59,7 @@ - + @@ -126,7 +126,7 @@ , LA.DMND_YMD , LA.DMND_TM , LA.RQSTR_NM - , LA.CHG_APRV_STTS + , LA.CHG_APRV_STTS_CD , LA.CHG_APRV_DT , LA.CHG_AUTZR_NM , LA.CHG_APRV_RSN @@ -259,7 +259,7 @@ , DMND_YMD , DMND_TM , RQSTR_NM - , CHG_APRV_STTS + , CHG_APRV_STTS_CD , CHG_APRV_DT , CHG_AUTZR_NM , CHG_APRV_RSN @@ -322,7 +322,7 @@ , #{dmndYmd} , #{dmndTm} , #{rqstrNm} - , #{chgAprvStts} + , #{chgAprvSttsCd} , #{chgAprvDt} , #{chgAutzrNm} , #{chgAprvRsn} @@ -337,80 +337,80 @@ /* 임대차계약 승인 대장 수정(lsctAprvMapper.updateLsctAprv) */ UPDATE ${lsctLinkTblNm} - SET CRDN_YMD = #{crdnYmd} - , CRDN_TM = #{crdnTm} - , VHRNO = #{vhrno} - , CTRT_BGNG_YMD = #{ctrtBgngYmd} - , CTRT_BGNG_TM = #{ctrtBgngTm} - , CTRT_END_YMD = #{ctrtEndYmd} - , CTRT_END_TM = #{ctrtEndTm} - , HIRER_SE_CD = #{hirerSeCd} - , HIRER_REG_NO = #{hirerRegNo} - , HIRER_NM = #{hirerNm} - , HIRER_TELNO = #{hirerTelno} - , HIRER_MBL_TELNO = #{hirerMblTelno} - , HIRER_EML_ADDR = #{hirerEmlAddr} - , HIRER_ZIP = #{hirerZip} - , HIRER_ADDR = #{hirerAddr} - , HIRER_DTL_ADDR = #{hirerDtlAddr} - , ROAD_NM_CD = #{roadNmCd} - , UDGD_SE_CD = #{udgdSeCd} - , BMNO = #{bmno} - , BSNO = #{bsno} - , BLDG_MNG_NO = #{bldgMngNo} - , STDG_CD = #{stdgCd} - , RENT_ENT_NM = #{rentEntNm} - , RENT_ENT_REG_NO = #{rentEntRegNo} - , RENT_ENT_TELNO = #{rentEntTelno} - , RENT_ENT_FXNO = #{rentEntFxno} - , RENT_ENT_EML_ADDR = #{rentEntEmlAddr} - , RENT_ENT_ZIP = #{rentEntZip} - , RENT_ENT_ADDR = #{rentEntAddr} - , RENT_ENT_DTL_ADDR = #{rentEntDtlAddr} - , ATCH_FILE_CNT = #{atchFileCnt} - , LSCT_SRVC_URL = #{lsctSrvcUrl} - , ATCH_FILE_NM1 = #{atchFileNm1} - , ATCH_FILE_PATH1 = #{atchFilePath1} - , ATCH_FILE_SZ1 = #{atchFileSz1} - , ATCH_FILE_NM2 = #{atchFileNm2} - , ATCH_FILE_PATH2 = #{atchFilePath2} - , ATCH_FILE_SZ2 = #{atchFileSz2} - , ATCH_FILE_NM3 = #{atchFileNm3} - , ATCH_FILE_PATH3 = #{atchFilePath3} - , ATCH_FILE_SZ3 = #{atchFileSz3} - , ATCH_FILE_NM4 = #atchFileNm4} - , ATCH_FILE_PATH4 = #{atchFilePath4} - , ATCH_FILE_SZ4 = #{atchFileSz4} - , CHG_APRV_STTS = #{chgAprvStts} - , CHG_APRV_DT = #{chgAprvDt} - , CHG_AUTZR_NM = #{chgAutzrNm} - , CHG_APRV_RSN = #{chgAprvRsn} - , CHG_APRV_IP = #{chgAprvIp} - , MDFCN_DT = - , MDFR = #{modifiedBy} - WHERE APRV_ID = #{aprvId} - AND DEL_YN = 'N' + SET CRDN_YMD = #{crdnYmd} + , CRDN_TM = #{crdnTm} + , VHRNO = #{vhrno} + , CTRT_BGNG_YMD = #{ctrtBgngYmd} + , CTRT_BGNG_TM = #{ctrtBgngTm} + , CTRT_END_YMD = #{ctrtEndYmd} + , CTRT_END_TM = #{ctrtEndTm} + , HIRER_SE_CD = #{hirerSeCd} + , HIRER_REG_NO = #{hirerRegNo} + , HIRER_NM = #{hirerNm} + , HIRER_TELNO = #{hirerTelno} + , HIRER_MBL_TELNO = #{hirerMblTelno} + , HIRER_EML_ADDR = #{hirerEmlAddr} + , HIRER_ZIP = #{hirerZip} + , HIRER_ADDR = #{hirerAddr} + , HIRER_DTL_ADDR = #{hirerDtlAddr} + , ROAD_NM_CD = #{roadNmCd} + , UDGD_SE_CD = #{udgdSeCd} + , BMNO = #{bmno} + , BSNO = #{bsno} + , BLDG_MNG_NO = #{bldgMngNo} + , STDG_CD = #{stdgCd} + , RENT_ENT_NM = #{rentEntNm} + , RENT_ENT_REG_NO = #{rentEntRegNo} + , RENT_ENT_TELNO = #{rentEntTelno} + , RENT_ENT_FXNO = #{rentEntFxno} + , RENT_ENT_EML_ADDR= #{rentEntEmlAddr} + , RENT_ENT_ZIP = #{rentEntZip} + , RENT_ENT_ADDR = #{rentEntAddr} + , RENT_ENT_DTL_ADDR= #{rentEntDtlAddr} + , ATCH_FILE_CNT = #{atchFileCnt} + , LSCT_SRVC_URL = #{lsctSrvcUrl} + , ATCH_FILE_NM1 = #{atchFileNm1} + , ATCH_FILE_PATH1 = #{atchFilePath1} + , ATCH_FILE_SZ1 = #{atchFileSz1} + , ATCH_FILE_NM2 = #{atchFileNm2} + , ATCH_FILE_PATH2 = #{atchFilePath2} + , ATCH_FILE_SZ2 = #{atchFileSz2} + , ATCH_FILE_NM3 = #{atchFileNm3} + , ATCH_FILE_PATH3 = #{atchFilePath3} + , ATCH_FILE_SZ3 = #{atchFileSz3} + , ATCH_FILE_NM4 = #atchFileNm4} + , ATCH_FILE_PATH4 = #{atchFilePath4} + , ATCH_FILE_SZ4 = #{atchFileSz4} + , CHG_APRV_STTS_CD = #{chgAprvSttsCd} + , CHG_APRV_DT = #{chgAprvDt} + , CHG_AUTZR_NM = #{chgAutzrNm} + , CHG_APRV_RSN = #{chgAprvRsn} + , CHG_APRV_IP = #{chgAprvIp} + , MDFCN_DT = + , MDFR = #{modifiedBy} + WHERE APRV_ID = #{aprvId} + AND DEL_YN = 'N' /* 임대차계약 승인 대장 삭제(lsctAprvMapper.deleteLsctAprv) */ UPDATE ${lsctLinkTblNm} - SET CHG_APRV_STTS = #{chgAprvStts} - , DEL_YN = 'Y' - , DEL_DT = - , DLTR = #{modifiedBy} - , DEL_RSN = #{delRsn} + SET CHG_APRV_STTS_CD = #{chgAprvSttsCd} + , DEL_YN = 'Y' + , DEL_DT = + , DLTR = #{modifiedBy} + , DEL_RSN = #{delRsn} - WHERE APRV_ID IN ( + WHERE APRV_ID IN ( #{aprvId} ) - WHERE APRV_ID = #{aprvId} + WHERE APRV_ID = #{aprvId} - AND CHG_APRV_STTS = 'RQ' - AND DEL_YN = 'N' + AND CHG_APRV_STTS_CD = 'RQ' + AND DEL_YN = 'N' diff --git a/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml b/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml index b09438a8..71dc299d 100644 --- a/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml +++ b/src/main/resources/sql/mapper/fims/rent/lsctMpng-mapper.xml @@ -307,10 +307,14 @@ , LV.VR_ACTNO20 , LM.LSCT_MPNG_ID , LM.DMND_DT - , LM.CHG_APRV_STTS - , (GET_CODE_NM('FIM089', LM.CHG_APRV_STTS)) AS CHG_APRV_STTS_NM + , LM.CHG_APRV_STTS_CD + , (GET_CODE_NM('CMN010', LM.CHG_APRV_STTS_CD)) AS CHG_APRV_STTS_NM , LM.CHG_APRV_DT + , L.CTRT_BGNG_YMD + , L.CTRT_BGNG_TM , (CONCAT(L.CTRT_BGNG_YMD, L.CTRT_BGNG_TM)) AS CTRT_BGNG_DT + , L.CTRT_END_YMD + , L.CTRT_END_TM , (CONCAT(L.CTRT_END_YMD, L.CTRT_END_TM)) AS CTRT_END_DT , L.HIRER_SE_CD , (GET_CODE_NM('FIM089', L.HIRER_SE_CD)) AS HIRER_SE_NM @@ -645,10 +649,10 @@ , P.RTPYR_NO , P.RTPYR_NM , LM.LSCT_MPNG_ID - , (CASE WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS = 'RQ' THEN '기타(요청중)' - WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS = 'RT' THEN '기타(요청취소)' - WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS = 'AP' THEN '기타(승인)' - WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS = 'UA' THEN '기타(미승인)' + , (CASE WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'RQ' THEN '기타(요청중)' + WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'RT' THEN '기타(요청취소)' + WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'AP' THEN '기타(승인)' + WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'UA' THEN '기타(미승인)' WHEN LM.DMND_YN = 'N' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '계약서등록' WHEN LM.DMND_YN = 'N' AND C.NXRP_CRDN_LINK_YN = 'Y' THEN '기타(세외수입)' ELSE '대상' @@ -666,7 +670,7 @@ , LM.DMND_RTRCN_USER_NM , LM.DMND_RTRCN_USER_ID , LM.DMND_RTRCN_IP - , LM.CHG_APRV_STTS + , LM.CHG_APRV_STTS_CD , LM.CHG_APRV_DT , LM.CHG_AUTZR_NM , LM.CHG_APRV_RSN @@ -720,7 +724,7 @@ AND LM.LSCT_MPNG_ID IS NOT NULL - AND (LM.DMND_YN = 'Y' OR LM.CHG_APRV_STTS IS NOT NULL OR C.NXRP_CRDN_LINK_YN = 'Y') + AND (LM.DMND_YN = 'Y' OR LM.CHG_APRV_STTS_CD IS NOT NULL OR C.NXRP_CRDN_LINK_YN = 'Y') @@ -789,8 +793,8 @@ , LM.DMND_RTRCN_USER_NM , LM.DMND_RTRCN_USER_ID , LM.DMND_RTRCN_IP - , LM.CHG_APRV_STTS - , (GET_CODE_NM('CMN010', LM.CHG_APRV_STTS)) AS CHG_APRV_STTS_NM + , LM.CHG_APRV_STTS_CD + , (GET_CODE_NM('CMN010', LM.CHG_APRV_STTS_CD)) AS CHG_APRV_STTS_NM , LM.CHG_APRV_DT , LM.CHG_AUTZR_NM , LM.CHG_APRV_RSN @@ -804,11 +808,11 @@ , LM.MDFCN_DT , LM.MDFR , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = LM.MDFR) AS MDFR_NM - , (CASE WHEN LM.DMND_YN = 'N' AND LM.CHG_APRV_STTS IS NULL AND C.NXRP_CRDN_LINK_YN = 'N' THEN '대상' - WHEN LM.DMND_YN = 'N' AND LM.CHG_APRV_STTS = 'RT' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '요청취소' - WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS = 'RQ' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '요청중' - WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS = 'AP' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '승인' - WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS = 'UA' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '미승인' + , (CASE WHEN LM.DMND_YN = 'N' AND LM.CHG_APRV_STTS_CD IS NULL AND C.NXRP_CRDN_LINK_YN = 'N' THEN '대상' + WHEN LM.DMND_YN = 'N' AND LM.CHG_APRV_STTS_CD = 'RT' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '요청취소' + WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'RQ' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '요청중' + WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'AP' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '승인' + WHEN LM.DMND_YN = 'Y' AND LM.CHG_APRV_STTS_CD = 'UA' AND C.NXRP_CRDN_LINK_YN = 'N' THEN '미승인' WHEN C.NXRP_CRDN_LINK_YN = 'Y' THEN '기타(세외수입)' ELSE '기타' END) AS TRGT_STTS_NM @@ -895,27 +899,27 @@ AND LM.DMND_YN = 'N' - AND LM.CHG_APRV_STTS IS NULL + AND LM.CHG_APRV_STTS_CD IS NULL AND C.NXRP_CRDN_LINK_YN = 'N' AND LM.DMND_YN = 'N' - AND LM.CHG_APRV_STTS = 'RT' + AND LM.CHG_APRV_STTS_CD = 'RT' AND C.NXRP_CRDN_LINK_YN = 'N' AND LM.DMND_YN = 'Y' - AND LM.CHG_APRV_STTS = 'RQ' + AND LM.CHG_APRV_STTS_CD = 'RQ' AND C.NXRP_CRDN_LINK_YN = 'N' AND LM.DMND_YN = 'Y' - AND LM.CHG_APRV_STTS = 'AP' + AND LM.CHG_APRV_STTS_CD = 'AP' AND C.NXRP_CRDN_LINK_YN = 'N' AND LM.DMND_YN = 'Y' - AND LM.CHG_APRV_STTS = 'UA' + AND LM.CHG_APRV_STTS_CD = 'UA' AND C.NXRP_CRDN_LINK_YN = 'N' @@ -988,7 +992,7 @@ , DMND_RTRCN_USER_NM , DMND_RTRCN_USER_ID , DMND_RTRCN_IP - , CHG_APRV_STTS + , CHG_APRV_STTS_CD , CHG_APRV_DT , CHG_AUTZR_NM , CHG_APRV_RSN @@ -1022,7 +1026,7 @@ , #{dmndRtrcnUserNm} , #{dmndRtrcnUserId} , #{dmndRtrcnIp} - , #{chgAprvStts} + , #{chgAprvSttsCd} , #{chgAprvDt} , #{chgAutzrNm} , #{chgAprvRsn} @@ -1053,7 +1057,7 @@ , DMND_RTRCN_USER_NM= #{dmndRtrcnUserNm} , DMND_RTRCN_USER_ID= #{dmndRtrcnUserId} , DMND_RTRCN_IP = #{dmndRtrcnIp} - , CHG_APRV_STTS = #{chgAprvStts} + , CHG_APRV_STTS_CD = #{chgAprvSttsCd} , CHG_APRV_DT = #{chgAprvDt} , CHG_AUTZR_NM = #{chgAutzrNm} , CHG_APRV_RSN = #{chgAprvRsn} @@ -1078,7 +1082,7 @@ , DMND_RTRCN_USER_NM= NULL , DMND_RTRCN_USER_ID= NULL , DMND_RTRCN_IP = NULL - , CHG_APRV_STTS = #{chgAprvStts} + , CHG_APRV_STTS_CD = #{chgAprvSttsCd} , LSCT_LINK_TBL_NM = #{lsctLinkTblNm} , LSCT_APRV_ID = #{lsctAprvId} @@ -1091,7 +1095,7 @@ , DMND_RTRCN_USER_NM= #{dmndRtrcnUserNm} , DMND_RTRCN_USER_ID= #{dmndRtrcnUserId} , DMND_RTRCN_IP = #{dmndRtrcnIp} - , CHG_APRV_STTS = NULL + , CHG_APRV_STTS_CD = NULL , LSCT_LINK_TBL_NM = NULL , LSCT_APRV_ID = NULL @@ -1103,7 +1107,7 @@ /* 임대차계약 매핑 대장 변경 승인 수정(lsctMapper.updateLsctMpngChgAprv) */ UPDATE TB_LSCT_MPNG - SET CHG_APRV_STTS = #{chgAprvStts} + SET CHG_APRV_STTS_CD = #{chgAprvSttsCd} , CHG_APRV_DT = #{chgAprvDt} , CHG_AUTZR_NM = #{chgAutzrNm} , CHG_APRV_RSN = #{chgAprvRsn}