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 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 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 - AND DATE_FORMAT(REG_DT, '%Y%m%d') =]]> #{searchStartDate} + AND DATE_FORMAT(t.REG_DT, '%Y%m%d') =]]> #{searchStartDate} - AND DATE_FORMAT(REG_DT, '%Y%m%d') #{searchEndDate} + AND DATE_FORMAT(t.REG_DT, '%Y%m%d') #{searchEndDate} - AND (DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR VHRNO LIKE CONCAT('%', #{vhrno}, '%')) + AND (t.DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR t.VHRNO LIKE CONCAT('%', #{vhrno}, '%')) - AND (DMND_VIN LIKE CONCAT('%', #{vin}, '%') OR VIN LIKE CONCAT('%', #{vin}, '%')) + AND (t.DMND_VIN LIKE CONCAT('%', #{vin}, '%') OR t.VIN LIKE CONCAT('%', #{vin}, '%')) - AND CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%') + AND t.CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%') - AND CNTC_RESULT_CODE = #{cntcResultCode} + AND t.CNTC_RESULT_CODE = #{cntcResultCode} @@ -92,44 +95,46 @@ 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 - AND DATE_FORMAT(REG_DT, '%Y%m%d') =]]> #{searchStartDate} + AND DATE_FORMAT(t.REG_DT, '%Y%m%d') =]]> #{searchStartDate} - AND DATE_FORMAT(REG_DT, '%Y%m%d') #{searchEndDate} + AND DATE_FORMAT(t.REG_DT, '%Y%m%d') #{searchEndDate} - AND (DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR VHRNO LIKE CONCAT('%', #{vhrno}, '%')) + AND (t.DMND_VHRNO LIKE CONCAT('%', #{vhrno}, '%') OR t.VHRNO LIKE CONCAT('%', #{vhrno}, '%')) - AND VIN LIKE CONCAT('%', #{vin}, '%') + AND t.VIN LIKE CONCAT('%', #{vin}, '%') - AND CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%') + AND t.CHARGER_NM LIKE CONCAT('%', #{chargerNm}, '%') - AND CNTC_RESULT_CODE = #{cntcResultCode} + AND t.CNTC_RESULT_CODE = #{cntcResultCode} 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 } ]; },