From 76e8e93f0bfe436c514be3ddf5af8e93d8928101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=84=B1=EC=98=81?= <xitpsy@xit.co.kr>
Date: Tue, 18 Nov 2025 14:46:36 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EB=A1=9D=EC=9E=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../history/model/CarBassMatterInqireVO.java  |   3 +
 .../history/model/CarLedgerFrmbkVO.java       |   3 +
 .../history/VehicleApiHistoryMapper_maria.xml | 140 +++++++++---------
 .../carInspectionPenalty/history/list.jsp     |   6 +-
 4 files changed, 83 insertions(+), 69 deletions(-)

diff --git a/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarBassMatterInqireVO.java b/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarBassMatterInqireVO.java
index d81eb34..5c3eba3 100644
--- a/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarBassMatterInqireVO.java
+++ b/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarBassMatterInqireVO.java
@@ -323,6 +323,9 @@ public class CarBassMatterInqireVO {
     /** 등록자 */
     private String rgtr;
 
+    /** 등록자명 */
+    private String rgtrNm;
+
     /** 대표소유자 성명 */
     private String mberNm;
 }
diff --git a/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarLedgerFrmbkVO.java b/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarLedgerFrmbkVO.java
index 0e41307..0959c24 100644
--- a/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarLedgerFrmbkVO.java
+++ b/src/main/java/go/kr/project/carInspectionPenalty/history/model/CarLedgerFrmbkVO.java
@@ -270,6 +270,9 @@ public class CarLedgerFrmbkVO {
     /** 등록자 */
     private String rgtr;
 
+    /** 등록자명 */
+    private String rgtrNm;
+
     /** 등록원부 변경 이력 */
     private List<CarLedgerFrmbkDtlVO> record;
 }
diff --git a/src/main/resources/mybatis/mapper/carInspectionPenalty/history/VehicleApiHistoryMapper_maria.xml b/src/main/resources/mybatis/mapper/carInspectionPenalty/history/VehicleApiHistoryMapper_maria.xml
index 4648dd5..75ea242 100644
--- a/src/main/resources/mybatis/mapper/carInspectionPenalty/history/VehicleApiHistoryMapper_maria.xml
+++ b/src/main/resources/mybatis/mapper/carInspectionPenalty/history/VehicleApiHistoryMapper_maria.xml
@@ -9,47 +9,49 @@
     <!-- 자동차 기본정보 조회 이력 목록 조회 -->
     <select id="selectCarBassMatterInqireList" parameterType="VehicleApiHistorySearchVO" resultType="CarBassMatterInqireVO">
         SELECT
-            CAR_BASS_MATTER_INQIRE_ID,
-            INFO_SYS_ID,
-            INFO_SYS_IP,
-            SIGUNGU_CODE,
-            CNTC_INFO_CODE,
-            CHARGER_ID,
-            CHARGER_IP,
-            CHARGER_NM,
-            DMND_LEVY_STDDE,
-            DMND_INQIRE_SE_CODE,
-            DMND_VHRNO,
-            DMND_VIN,
-            CNTC_RESULT_CODE,
-            CNTC_RESULT_DTLS,
-            VHRNO,
-            VIN,
-            CNM,
-            MBER_NM,
-            REG_DT,
-            RGTR
-        FROM tb_car_bass_matter_inqire
+            t.CAR_BASS_MATTER_INQIRE_ID,
+            t.INFO_SYS_ID,
+            t.INFO_SYS_IP,
+            t.SIGUNGU_CODE,
+            t.CNTC_INFO_CODE,
+            t.CHARGER_ID,
+            t.CHARGER_IP,
+            t.CHARGER_NM,
+            t.DMND_LEVY_STDDE,
+            t.DMND_INQIRE_SE_CODE,
+            t.DMND_VHRNO,
+            t.DMND_VIN,
+            t.CNTC_RESULT_CODE,
+            t.CNTC_RESULT_DTLS,
+            t.VHRNO,
+            t.VIN,
+            t.CNM,
+            t.MBER_NM,
+            t.REG_DT,
+            t.RGTR,
+            u.USER_NM AS rgtrNm
+        FROM tb_car_bass_matter_inqire t
+        LEFT JOIN tb_user u ON t.RGTR = u.USER_ID
         WHERE 1=1
         <if test='searchStartDate != null and searchStartDate != ""'>
-            AND DATE_FORMAT(REG_DT, '%Y%m%d') <![CDATA[>=]]> #{searchStartDate}
+            AND DATE_FORMAT(t.REG_DT, '%Y%m%d') <![CDATA[>=]]> #{searchStartDate}
         </if>
         <if test='searchEndDate != null and searchEndDate != ""'>
-            AND DATE_FORMAT(REG_DT, '%Y%m%d') <![CDATA[<=]]> #{searchEndDate}
+            AND DATE_FORMAT(t.REG_DT, '%Y%m%d') <![CDATA[<=]]> #{searchEndDate}
         </if>
         <if test='vhrno != null and vhrno != ""'>
-            AND (DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR VHRNO LIKE CONCAT('%', #{vhrno}, '%'))
+            AND (t.DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR t.VHRNO LIKE CONCAT('%', #{vhrno}, '%'))
         </if>
         <if test='vin != null and vin != ""'>
-            AND (DMND_VIN LIKE CONCAT('%', #{vin}, '%') OR VIN LIKE CONCAT('%', #{vin}, '%'))
+            AND (t.DMND_VIN LIKE CONCAT('%', #{vin}, '%') OR t.VIN LIKE CONCAT('%', #{vin}, '%'))
         </if>
         <if test='chargerNm != null and chargerNm != ""'>
-            AND CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%')
+            AND t.CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%')
         </if>
         <if test='cntcResultCode != null and cntcResultCode != ""'>
-            AND CNTC_RESULT_CODE = #{cntcResultCode}
+            AND t.CNTC_RESULT_CODE = #{cntcResultCode}
         </if>
-        ORDER BY REG_DT DESC
+        ORDER BY t.REG_DT DESC
         <if test='pagingYn == "Y"'>
             LIMIT #{startIndex}, #{perPage}
         </if>
@@ -58,25 +60,26 @@
     <!-- 자동차 기본정보 조회 이력 총 개수 조회 -->
     <select id="selectCarBassMatterInqireListTotalCount" parameterType="VehicleApiHistorySearchVO" resultType="int">
         SELECT COUNT(*)
-        FROM tb_car_bass_matter_inqire
+        FROM tb_car_bass_matter_inqire t
+        LEFT JOIN tb_user u ON t.RGTR = u.USER_ID
         WHERE 1=1
         <if test='searchStartDate != null and searchStartDate != ""'>
-            AND DATE_FORMAT(REG_DT, '%Y%m%d') <![CDATA[>=]]> #{searchStartDate}
+            AND DATE_FORMAT(t.REG_DT, '%Y%m%d') <![CDATA[>=]]> #{searchStartDate}
         </if>
         <if test='searchEndDate != null and searchEndDate != ""'>
-            AND DATE_FORMAT(REG_DT, '%Y%m%d') <![CDATA[<=]]> #{searchEndDate}
+            AND DATE_FORMAT(t.REG_DT, '%Y%m%d') <![CDATA[<=]]> #{searchEndDate}
         </if>
         <if test='vhrno != null and vhrno != ""'>
-            AND (DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR VHRNO LIKE CONCAT('%', #{vhrno}, '%'))
+            AND (t.DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR t.VHRNO LIKE CONCAT('%', #{vhrno}, '%'))
         </if>
         <if test='vin != null and vin != ""'>
-            AND (DMND_VIN LIKE CONCAT('%', #{vin}, '%') OR VIN LIKE CONCAT('%', #{vin}, '%'))
+            AND (t.DMND_VIN LIKE CONCAT('%', #{vin}, '%') OR t.VIN LIKE CONCAT('%', #{vin}, '%'))
         </if>
         <if test='chargerNm != null and chargerNm != ""'>
-            AND CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%')
+            AND t.CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%')
         </if>
         <if test='cntcResultCode != null and cntcResultCode != ""'>
-            AND CNTC_RESULT_CODE = #{cntcResultCode}
+            AND t.CNTC_RESULT_CODE = #{cntcResultCode}
         </if>
     </select>
 
@@ -92,44 +95,46 @@
     <!-- 자동차 등록원부(갑) 조회 이력 목록 조회 -->
     <select id="selectCarLedgerFrmbkList" parameterType="VehicleApiHistorySearchVO" resultType="CarLedgerFrmbkVO">
         SELECT
-            CAR_LEDGER_FRMBK_ID,
-            INFO_SYS_ID,
-            INFO_SYS_IP,
-            SIGUNGU_CODE,
-            CNTC_INFO_CODE,
-            CHARGER_ID,
-            CHARGER_IP,
-            CHARGER_NM,
-            DMND_VHRNO,
-            CNTC_RESULT_CODE,
-            CNTC_RESULT_DTLS,
-            VHRNO,
-            VIN,
-            CNM,
-            MBER_NM,
-            REG_DT,
-            RGTR
-        FROM tb_car_ledger_frmbk
+            t.CAR_LEDGER_FRMBK_ID,
+            t.INFO_SYS_ID,
+            t.INFO_SYS_IP,
+            t.SIGUNGU_CODE,
+            t.CNTC_INFO_CODE,
+            t.CHARGER_ID,
+            t.CHARGER_IP,
+            t.CHARGER_NM,
+            t.DMND_VHRNO,
+            t.CNTC_RESULT_CODE,
+            t.CNTC_RESULT_DTLS,
+            t.VHRNO,
+            t.VIN,
+            t.CNM,
+            t.MBER_NM,
+            t.REG_DT,
+            t.RGTR,
+            u.USER_NM AS rgtrNm
+        FROM tb_car_ledger_frmbk t
+        LEFT JOIN tb_user u ON t.RGTR = u.USER_ID
         WHERE 1=1
         <if test='searchStartDate != null and searchStartDate != ""'>
-            AND DATE_FORMAT(REG_DT, '%Y%m%d') <![CDATA[>=]]> #{searchStartDate}
+            AND DATE_FORMAT(t.REG_DT, '%Y%m%d') <![CDATA[>=]]> #{searchStartDate}
         </if>
         <if test='searchEndDate != null and searchEndDate != ""'>
-            AND DATE_FORMAT(REG_DT, '%Y%m%d') <![CDATA[<=]]> #{searchEndDate}
+            AND DATE_FORMAT(t.REG_DT, '%Y%m%d') <![CDATA[<=]]> #{searchEndDate}
         </if>
         <if test='vhrno != null and vhrno != ""'>
-            AND (DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR VHRNO LIKE CONCAT('%', #{vhrno}, '%'))
+            AND (t.DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR t.VHRNO LIKE CONCAT('%', #{vhrno}, '%'))
         </if>
         <if test='vin != null and vin != ""'>
-            AND VIN LIKE CONCAT('%', #{vin}, '%')
+            AND t.VIN LIKE CONCAT('%', #{vin}, '%')
         </if>
         <if test='chargerNm != null and chargerNm != ""'>
-            AND CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%')
+            AND t.CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%')
         </if>
         <if test='cntcResultCode != null and cntcResultCode != ""'>
-            AND CNTC_RESULT_CODE = #{cntcResultCode}
+            AND t.CNTC_RESULT_CODE = #{cntcResultCode}
         </if>
-        ORDER BY REG_DT DESC
+        ORDER BY t.REG_DT DESC
         <if test='pagingYn == "Y"'>
             LIMIT #{startIndex}, #{perPage}
         </if>
@@ -138,25 +143,26 @@
     <!-- 자동차 등록원부(갑) 조회 이력 총 개수 조회 -->
     <select id="selectCarLedgerFrmbkListTotalCount" parameterType="VehicleApiHistorySearchVO" resultType="int">
         SELECT COUNT(*)
-        FROM tb_car_ledger_frmbk
+        FROM tb_car_ledger_frmbk t
+        LEFT JOIN tb_user u ON t.RGTR = u.USER_ID
         WHERE 1=1
         <if test='searchStartDate != null and searchStartDate != ""'>
-            AND DATE_FORMAT(REG_DT, '%Y%m%d') <![CDATA[>=]]> #{searchStartDate}
+            AND DATE_FORMAT(t.REG_DT, '%Y%m%d') <![CDATA[>=]]> #{searchStartDate}
         </if>
         <if test='searchEndDate != null and searchEndDate != ""'>
-            AND DATE_FORMAT(REG_DT, '%Y%m%d') <![CDATA[<=]]> #{searchEndDate}
+            AND DATE_FORMAT(t.REG_DT, '%Y%m%d') <![CDATA[<=]]> #{searchEndDate}
         </if>
         <if test='vhrno != null and vhrno != ""'>
-            AND (DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR VHRNO LIKE CONCAT('%', #{vhrno}, '%'))
+            AND (t.DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR t.VHRNO LIKE CONCAT('%', #{vhrno}, '%'))
         </if>
         <if test='vin != null and vin != ""'>
-            AND VIN LIKE CONCAT('%', #{vin}, '%')
+            AND t.VIN LIKE CONCAT('%', #{vin}, '%')
         </if>
         <if test='chargerNm != null and chargerNm != ""'>
-            AND CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%')
+            AND t.CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%')
         </if>
         <if test='cntcResultCode != null and cntcResultCode != ""'>
-            AND CNTC_RESULT_CODE = #{cntcResultCode}
+            AND t.CNTC_RESULT_CODE = #{cntcResultCode}
         </if>
     </select>
 
diff --git a/src/main/webapp/WEB-INF/views/carInspectionPenalty/history/list.jsp b/src/main/webapp/WEB-INF/views/carInspectionPenalty/history/list.jsp
index ee33950..570b6a1 100644
--- a/src/main/webapp/WEB-INF/views/carInspectionPenalty/history/list.jsp
+++ b/src/main/webapp/WEB-INF/views/carInspectionPenalty/history/list.jsp
@@ -344,7 +344,8 @@
                                 return e.value ? moment(e.value).format('YYYY-MM-DD HH:mm:ss') : '';
                             }
                         },
-                        { header: '등록자', name: 'rgtr', align: 'center', width: 100 }
+                        { header: '등록자ID', name: 'rgtr', align: 'center', width: 100, hidden: true },
+                        { header: '등록자', name: 'rgtrNm', align: 'center', width: 100 }
                     ];
                 },
 
@@ -536,7 +537,8 @@
                                 return e.value ? moment(e.value).format('YYYY-MM-DD HH:mm:ss') : '';
                             }
                         },
-                        { header: '등록자', name: 'rgtr', align: 'center', width: 100 }
+                        { header: '등록자ID', name: 'rgtr', align: 'center', width: 100, hidden: true },
+                        { header: '등록자', name: 'rgtrNm', align: 'center', width: 100 }
                     ];
                 },