임대계약서 관리 수정.

src/main/java/cokr/xit/fims/rent/RentQuery.java

@@ -37,6 +37,7 @@ public class RentQuery extends CmmnQuery {
     private String omJno;                                                       // 소유주 번호
     private String[] rtpyrNos;                                                  // 납부자 번호s
     private String rtpyrNo;                                                     // 납부자 번호
+    private String nxrpCrdnLinkYn;                                              // 세외수입 단속 연계 여부
 
     // ETC
     private String callPurpose;                                                 // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정, refresh 재조회).
@@ -186,6 +187,14 @@ public class RentQuery extends CmmnQuery {
         this.rtpyrNo = rtpyrNo;
     }
 
+    public String getNxrpCrdnLinkYn() {
+        return ifEmpty(nxrpCrdnLinkYn, () -> null);
+    }
+
+    public void setNxrpCrdnLinkYn(String nxrpCrdnLinkYn) {
+        this.nxrpCrdnLinkYn = nxrpCrdnLinkYn;
+    }
+
     // ETC /////////////////////////////////////////////////////////////////////
     public String getCallPurpose() {
         return ifEmpty(callPurpose, () -> null);

src/main/java/cokr/xit/fims/rent/service/bean/LsctBean.java

@@ -171,10 +171,14 @@ public class LsctBean extends AbstractBean {
                     crdn.setMinusAmt(mainList.get(iLoop).number("MM_MINUS_KEUM").intValue());   // 감경 금액
                     crdn.setRcvmtAmt(mainList.get(iLoop).number("MM_SUKEUM").intValue());       // 수납 금액
                     crdn.setBfrCrdnId(mainList.get(iLoop).string("MM_PRECODE"));                // 이전 단속 ID
-                    crdn.setNxrpCrdnLinkYn(null);                                               // 세외수입 단속 연계 여부
+                    crdn.setNxrpCrdnLinkYn(mainList.get(iLoop).string("NIS_LINK_YN"));          // 세외수입 단속 연계 여부
                     crdn.setNxrpCrdnLinkUserId(null);                                           // 세외수입 단속 연계 사용자 ID
                     crdn.setNxrpCrdnLinkDt(null);                                               // 세외수입 단속 연계 일시
-                    crdn.setNxrpAcbKey(null);                                                   // 세외수입 대장 키
+                    if (mainList.get(iLoop).string("MC_LVY_KEY").length() == 11) {              // 세외수입 대장 키
+                        crdn.setNxrpAcbKey(mainList.get(iLoop).string("MC_LVY_KEY"));
+                    } else {
+                        crdn.setNxrpAcbKey(null);
+                    }
                     crdn.setDelYn("N");                                                         // 삭제 여부
                     crdn.setCreatedAt(mainList.get(iLoop).string("MM_INDT"));
                     crdn.setCreatedBy(mainList.get(iLoop).string("MM_INUSER"));

src/main/java/cokr/xit/fims/rent/web/Rent02Controller.java

@@ -22,7 +22,6 @@ import cokr.xit.fims.base.FimsUser;
 import cokr.xit.fims.cmmn.service.bean.StngBean;
 import cokr.xit.fims.cmmn.xls.FormatMaker;
 import cokr.xit.fims.cmmn.xls.StyleMaker;
-import cokr.xit.fims.excl.LevyExclQuery;
 import cokr.xit.fims.rent.Lsct;
 import cokr.xit.fims.rent.RentQuery;
 import cokr.xit.fims.rent.service.HirerService;

src/main/resources/sql/mapper/fims/rent/lsct-mapper.xml

@@ -51,12 +51,12 @@
              , MM_DLGB
              , MM_INGB
              , MM_DATE
-             , (CASE WHEN LENGTH(MM_TIME) = 4 THEN CONCAT(MM_TIME, '00')
+             , (CASE WHEN LENGTH(MM_TIME) = 4 THEN CONCAT(MM_TIME, '00') ELSE MM_TIME END)  AS MM_TIME
-                     ELSE MM_TIME END)                                          AS MM_TIME
              , MM_LAWGB
              , (SELECT VLTN_ID FROM TB_VLTN X
                  WHERE X.VLTN_CD = LPAD(MM_LAWGB, 2, '0')
-                   AND X.SGG_CD  = MM_SGGCODE AND X.TASK_SE_CD = MM_TASKGB)     AS VLTN_ID
+                   AND X.SGG_CD  = MM_SGGCODE
+                   AND X.TASK_SE_CD = MM_TASKGB) AS VLTN_ID
              , MM_SGNM
              , MM_SGTEL
              , MM_SGCONT
@@ -93,8 +93,7 @@
              , MM_VIDEOFILENM
              , MM_SAFEZONE
              , MM_VIORCNT
-             , (CASE WHEN LENGTH(MM_TIME2) = 4 THEN CONCAT(MM_TIME2, '00')
+             , (CASE WHEN LENGTH(MM_TIME2) = 4 THEN CONCAT(MM_TIME2, '00') ELSE MM_TIME2 END)   AS MM_TIME2
-                     ELSE MM_TIME2 END)                                         AS MM_TIME2
              , MM_CARNAME
              , MM_CARCOLOR
              , MM_CARFUEL
@@ -117,6 +116,8 @@
              , OM_INGB
              , OM_INDT
              , OM_BDCODE
+             , MC_LVY_KEY
+             , (CASE WHEN MC_LVY_KEY IS NOT NULL THEN 'Y' ELSE 'N' END) AS NIS_LINK_YN
           FROM VW_CP_MAIN
         <where>
             <if test="schCrdnYmdFrom != null">
@@ -322,6 +323,8 @@
              , C.FFNLG_CRDN_AMT     <!-- 과태료 단속 금액 -->
              , C.CRDN_STTS_CD       <!-- 단속 상태 코드 -->
              , (SELECT GET_CODE_NM('FIM010', C.CRDN_STTS_CD) FROM DUAL)     AS CRDN_STTS_NM     <!-- 단속 상태 명 -->
+             , C.NXRP_CRDN_LINK_YN  <!-- 세외수입 단속 연계 여부 -->
+             , C.NXRP_ACB_KEY       <!-- 세외수입 대장 키 -->
              , V.VLTN_ID            <!-- 위반 ID -->
              , V.VLTN_CD            <!-- 위반 코드 -->
              , V.VLTN_ARTCL         <!-- 위반 항목 -->
@@ -376,6 +379,9 @@
             </if>
             <if test="schVhrno != null">
            AND C.VHRNO      =  #{schVhrno}  <!-- 차량번호 -->
+            </if>
+            <if test="nxrpCrdnLinkYn != null">
+           AND C.NXRP_CRDN_LINK_YN  =  #{nxrpCrdnLinkYn}    <!-- 세외수입 단속 연계 여부 -->
             </if>
             <if test="rtpyrNos != null">
            AND P.RTPYR_NO  IN (             <!-- 납부자 번호s -->