diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 7d1712a3..45173c02 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -17,7 +17,7 @@ public class CrdnQuery extends QueryRequest { private static final long serialVersionUID = 1L; private String grid; - private String inquireDataType; + private String inspectionDataType; private String crdnId; private String[] crdnIDs; private String taskSeCd; @@ -40,12 +40,12 @@ public class CrdnQuery extends QueryRequest { return self(); } - public String getInquireDataType() { - return ifEmpty(inquireDataType, () -> null); + public String getInspectionDataType() { + return ifEmpty(inspectionDataType, () -> null); } - public T setInquireDataType(String inquireDataType) { - this.inquireDataType = inquireDataType; + public T setInspectionDataType(String inspectionDataType) { + this.inspectionDataType = inspectionDataType; return self(); } diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java index e01acfb2..18777815 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java @@ -29,7 +29,7 @@ public interface Crdn06Mapper extends AbstractMapper { * @param req 단속사진 검사 자료 목록 조회 조건 * @return 단속사진 검사 자료 목록 */ - List selectPhotoInquireDataList(CrdnQuery setOrderBy); + List selectPhotoInspectionDataList(CrdnQuery setOrderBy); /**동일 차량 단속 그룹 목록을 조회한다.
* {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java index a27bfeba..eb4b33db 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java @@ -45,7 +45,7 @@ public class Crdn06Bean extends AbstractComponent { case "fineReductionData": return crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID")); case "photo": - return crdn06Mapper.selectPhotoInquireDataList(req.setOrderBy("CRDN_ID")); + return crdn06Mapper.selectPhotoInspectionDataList(req.setOrderBy("CRDN_ID")); case "sameVehicleMain": return crdn06Mapper.selectSameVehicleMainList(req.setOrderBy("VHRNO")); case "sameVehicleSub": diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 1e67f2c7..17399bbf 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -116,8 +116,8 @@ public class Crdn06Controller extends ApplicationController { * "crdnTotal": 조회 결과 찾은 전체 건 수 * } */ - public ModelAndView getInquireDataList(CrdnQuery req) { - switch(req.getInquireDataType()) { + public ModelAndView getInspectionDataList(CrdnQuery req) { + switch(req.getInspectionDataType()) { case "photo" -> req.setGrid("photo"); case "sameVehicleMain" -> req.setGrid("sameVehicleMain"); case "sameVehicleSub" -> req.setGrid("sameVehicleSub"); diff --git a/src/main/java/cokr/xit/fims/crdn/web/TaskCrdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/TaskCrdn06Controller.java index cc315c59..f2449b01 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/TaskCrdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/TaskCrdn06Controller.java @@ -39,20 +39,20 @@ public class TaskCrdn06Controller extends Crdn06Controller { } @RequestMapping(name="주정차과태료업무 검사자료 목록", value="/020/PVS/list.do") - public ModelAndView getPvsInquireDataList(CrdnQuery req) { - return getInquireDataList(req); + public ModelAndView getPvsInspectionDataList(CrdnQuery req) { + return getInspectionDataList(req); } @RequestMapping(name="전용차로과태료업무 검사자료 목록", value="/020/BPV/list.do") - public ModelAndView getBpvInquireDataList(CrdnQuery req) { - return getInquireDataList(req); + public ModelAndView getBpvInspectionDataList(CrdnQuery req) { + return getInspectionDataList(req); } @RequestMapping(name="장애인과태료업무 검사자료 목록", value="/020/DPV/list.do") - public ModelAndView getDpvInquireDataList(CrdnQuery req) { - return getInquireDataList(req); + public ModelAndView getDpvInspectionDataList(CrdnQuery req) { + return getInspectionDataList(req); } @RequestMapping(name="전기차과태료업무 검사자료 목록", value="/020/ECA/list.do") - public ModelAndView getEcaInquireDataList(CrdnQuery req) { - return getInquireDataList(req); + public ModelAndView getEcaInspectionDataList(CrdnQuery req) { + return getInspectionDataList(req); } /**표지정보미확인자료 목록을 조회한다.
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index 6429a6b2..0481b7b3 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -232,8 +232,8 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') - +/* 단속사진 검사 자료 목록 조회(crdn06Mapper.selectPhotoInspectionDataList) */ SELECT C.CRDN_ID , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 610458ec..c2e3a3aa 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -164,7 +164,41 @@ 제외내역 - 트래픽~~ + No. + 시군구명 + 자료출처 + 차량번호 + 단속일시 + 단속조 + 단속원 + 사진건수 + 스티커번호 + 처리상태 + 서손사유 + 차량구분 + 차종 + 차량명 + 단속동 + 단속장소 + 단속원금 + 경감금액 + 잔액 + 위반법규 + 견인여부 + 단속특별지역 + 부과일자 + 성명 + 주민번호 + 주소 + 번지 + 우편번호 + GPS-X + GPS-Y + 단속특이사항 + 자료입력일시 + 특이사항 + 등록사용자 + 렌트등록자 diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index 985b6ef6..5b1883fc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -10,8 +10,8 @@
- +
+ + + +
+
+
-
+ + +
- -
    + +
@@ -115,11 +127,11 @@
-
-