diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 2ff020e3..ef36590b 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -16,6 +16,7 @@ public class CrdnQuery extends QueryRequest { private static final long serialVersionUID = 1L; + private String grid; private String crdnId; private String taskSeCd; private String schDateOpt; @@ -23,6 +24,15 @@ public class CrdnQuery extends QueryRequest { private String schDateTo; private String vhrno; + public String getGrid() { + return ifEmpty(grid, () -> null); + } + + public T setGrid(String grid) { + this.grid = grid; + return self(); + } + public String getCrdnId() { return ifEmpty(crdnId, () -> null); } 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 b73ae47f..1ed5592e 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn06Mapper.java @@ -7,6 +7,7 @@ import org.egovframe.rte.psl.dataaccess.mapper.Mapper; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.foundation.component.AbstractMapper; +import cokr.xit.foundation.component.QueryRequest; import cokr.xit.foundation.data.DataObject; /**단속 관리 DAO @@ -22,8 +23,24 @@ public interface Crdn06Mapper extends AbstractMapper { */ List selectCrackdownList(CrdnQuery req); + /**표지정보 미확인 자료 목록을 조회한다.
+ * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * @param req 표지정보 미확인 자료 목록 조회 조건 + * @return 표지정보 미확인 자료 목록 + */ + List selectTagInformationUndefinedDataList(CrdnQuery req); + + /**과태료 감경 자료 목록을 조회한다.
+ * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고 + * @param req 과태료 감경 자료 목록 조회 조건 + * @return 과태료 감경 자료 목록 + */ + List selectFineReductionDataList(QueryRequest setOrderBy); + List selectCrackdowns(CrdnQuery req); + + } 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 b3ef039d..f22794dd 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 @@ -39,8 +39,14 @@ public class Crdn06Bean extends AbstractComponent { } } - return crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID")); + switch (ifEmpty(req.getGrid(), () -> "")) { + case "TagInformationUndefinedData": + return crdn06Mapper.selectTagInformationUndefinedDataList(req.setOrderBy("CRDN_ID")); + case "FineReductionData": + return crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID")); + default: + return crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID")); + } } - } 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 5e1f7246..6d742b2d 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/TaskCrdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/TaskCrdn06Controller.java @@ -32,11 +32,23 @@ public class TaskCrdn06Controller extends Crdn06Controller { @RequestMapping(name="장애인과태료업무 표지정보미확인자료 목록", value="/030/DPV/list.do") public ModelAndView getTagInformationUndefinedDataList(CrdnQuery req) { - - //TODO : 표지정보 관련 연계 - - return getCrackdownList(req); + return getCrackdownList(req.setGrid("TagInformationUndefinedData")); } - + @RequestMapping(name="주정차과태료업무 과태료 감경 자료 목록", value="/040/PVS/list.do") + public ModelAndView getPvsFineReductionDataList(CrdnQuery req) { + return getCrackdownList(req.setGrid("FineReductionData")); + } + @RequestMapping(name="전용차로과태료업무 과태료 감경 자료 목록", value="/040/BPV/list.do") + public ModelAndView getBpvFineReductionDataList(CrdnQuery req) { + return getCrackdownList(req.setGrid("FineReductionData")); + } + @RequestMapping(name="장애인과태료업무 과태료 감경 자료 목록", value="/040/DPV/list.do") + public ModelAndView getDpvFineReductionDataList(CrdnQuery req) { + return getCrackdownList(req.setGrid("FineReductionData")); + } + @RequestMapping(name="전기차과태료업무 과태료 감경 자료 목록", value="/040/ECA/list.do") + public ModelAndView getEcaFineReductionDataList(CrdnQuery req) { + return getCrackdownList(req.setGrid("FineReductionData")); + } } 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 f7b9cf57..f68dea46 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -227,6 +227,114 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') + + + +