From 4fbf3477edf1c329f4ad11fe0418fdd62427940b Mon Sep 17 00:00:00 2001
From: minuk926 <minuk926@gmail.com>
Date: Mon, 16 Jan 2023 17:09:53 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EB=8B=A8=EC=86=8D=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EC=A7=84=ED=96=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../support/util/constants/Globals.java       |  2 -
 .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 13 +++
 .../jsp/fims/biz/rt/rtRegltMgtForm.jsp        | 96 +++++++++++++++----
 .../resources/framework/js/cmm/cmmUtil.js     | 11 +++
 4 files changed, 101 insertions(+), 21 deletions(-)

diff --git a/src/main/java/kr/xit/framework/support/util/constants/Globals.java b/src/main/java/kr/xit/framework/support/util/constants/Globals.java
index 655afb73..4bbc647b 100644
--- a/src/main/java/kr/xit/framework/support/util/constants/Globals.java
+++ b/src/main/java/kr/xit/framework/support/util/constants/Globals.java
@@ -1,8 +1,6 @@
 package kr.xit.framework.support.util.constants;
 
 public class Globals {
-	//public static final boolean IS_SP_ALERT_MSG = PropertyHelper.getBoolean("Globals.error.isAlert");
-	public static final String EXCEPTION_LOG_TRACE = "exception.log.trace";
 	public static final String JSON_RESULT_CODE= "code";
 	public static final String JSON_RESULT_MESSAGE= "message";
 
diff --git a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml
index 91747b0a..d2086d90 100644
--- a/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml
+++ b/src/main/resources/sqlmapper/biz/rt/rt-reglt-and-erpp-mysql-mapper.xml
@@ -8,13 +8,25 @@
     ************************************************************************************************************** -->
     <sql id="sqlRtReglt">
         SELECT trr.reglt_id
+             , trr.payer_id
              , trr.instt_code
              , trr.sys_code
              , trr.reglt_se_code
              , trr.input_se_code
              , trr.reglt_de
+             , trr.reglt_begin_time
+             , trr.reglt_end_time
+             , trr.violt_lrg_code
+             , trr.violt_dtls_code
+             , trr.violt_dtls_etc_cn
              , trr.reglt_place
              , trr.violt_co
+             , trr.violt_legaldong_code
+             , trr.gps_x
+             , trr.gps_y
+             , trr.towng_at_code
+             , trr.stickr_no
+             , trr.image_nmrs
              , trr.redution_amount
              , trr.redution_aft_amount
              , trr.rciv_amount
@@ -52,6 +64,7 @@
            AND INSTR(trr.vhcle_no, #{vhcleNo}) > 0
          </if>
          </where>
+         ORDER BY trr.reglt_de, trr.reglt_se_code, trr.vhcle_no, trr.reglt_begin_time
     </select>
 
     <select id="selectRtReglt" resultType="kr.xit.fims.biz.rt.model.RtDTO$Reglt">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp
index 542e9448..38f87f61 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtForm.jsp
@@ -145,58 +145,116 @@
      ******************************* */
     const initGrid = () => {
         const gridColumns = [
+            {
+                header: '단속일',
+                name: 'regltDe',
+                width: 80,
+                sortable: false,
+                align: 'center',
+                formatter({value}) {
+                    return setDateFmt(value); //
+                }
+            },
+            {
+                header: '단속구분',
+                name: 'regltSeCode',
+                minWidth: 80,
+                sortable: true,
+                align: 'center',
+                formatter: 'listItemText',
+                //TODO: 편집불가인 경우 disabled: true???
+                //editable: false,
+                disabled: true,
+                editor: {
+                    type: "select",
+                    options: {
+                        listItems: ComboCodeData.regltSeCode
+                    }
+                },
+            },
+            {
+                header: '단속시간',
+                name: 'regltBeginTime',
+                width: 80,
+                sortable: false,
+                align: 'center',
+                formatter({value}) {
+                    return setTimeFmt(value); //
+                }
+            },
             {
                 header: '차량번호',
                 name: 'vhcleNo',
-                minWidth: 200,
+                minWidth: 100,
                 sortable: true,
                 align: 'center'
             },
             {
                 header: '위반장소',
                 name: 'regltPlace',
-                width: 200,
+                minWidth: 200,
                 sortable: false,
-                align: 'center'
+                //align: 'center'
             },
             {
-                header: '위반횟수',
-                name: 'violtCo',
-                width: 200,
+                header: '처리상태',
+                name: 'regltProcessSttusCode',
+                minWidth: 80,
                 sortable: false,
-                align: 'center'
+                align: 'center',
+                formatter: 'listItemText',
+                //TODO: 편집불가인 경우 disabled: true???
+                //editable: false,
+                disabled: true,
+                editor: {
+                    type: "select",
+                    options: {
+                        listItems: ComboCodeData.regltProcessSttusCode
+                    }
+                },
             },
             {
                 header: '수납금액',
                 name: 'rcivAmount',
-                width: 200,
+                minWidth: 100,
                 sortable: false,
-                align: 'center'
+                align: 'right'
             },
             {
-                header: '단속일시',
-                name: 'regltDe',
-                width: 200,
+                header: '위반횟수',
+                name: 'violtCo',
+                minWidth: 80,
                 sortable: false,
-                align: 'center',
-                formatter({value}) {
-                    return setDateFmt(value); //
-                }
+                align: 'right'
             },
+            // {
+            //     header: '위반법규',
+            //     name: 'violtLrgCode',
+            //     minWidth: 200,
+            //     sortable: false,
+            //     //align: 'center'
+            // },
+            // {
+            //     header: '위반내역',
+            //     name: 'violtDtlsCode',
+            //     minWidth: 200,
+            //     sortable: false,
+            //     //align: 'center'
+            // },
             {
                 header: '등록일시',
                 name: 'registDt',
-                width: 200,
+                minWidth: 150,
                 sortable: false,
                 align: 'center',
                 formatter({value}) {
-                    return setDateFmt(value); //
+                    return setDateTimeFmt(value); //
                 }
             },
             {
                 header: '최종처리일시',
                 name: 'last_process_dt',
-                width: 200,
+                minWidth: 150,
                 sortable: false,
                 align: 'center',
                 formatter({value}) {
diff --git a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js
index cba7e9df..8888f29f 100644
--- a/src/main/webapp/resources/framework/js/cmm/cmmUtil.js
+++ b/src/main/webapp/resources/framework/js/cmm/cmmUtil.js
@@ -454,6 +454,17 @@ function setDateFmt(srcDateStr, delimiter = '-') {
     }
 }
 
+function setTimeFmt(srcDateStr, delimiter = ':') {
+    if(srcDateStr == null || srcDateStr.isBlank()) return srcDateStr;
+
+    let srcDate = srcDateStr.replace(/\-|\s|\:|\./g,'');
+    if(srcDate.length >= 6) {
+        return srcDate.substring(0, 2)+delimiter+srcDate.substring(2, 4)+delimiter+srcDate.substring(4, 6);
+    }else{
+        return srcDate;
+    }
+}
+
 /**
  * yyyy-MM-ddTHH24:mi:ss.xxxxxxZ
  * @param {string} srcDateStr