From afc95a70dccf3d810419fb5d338f817c7fc31c92 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 19 Oct 2023 14:19:42 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=B4=EC=A0=9C=EC=B0=A8=EB=9F=89=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/crdn/CrdnQuery.java | 20 ++ .../xit/fims/crdn/dao/ExmptnVhclMapper.java | 10 + .../fims/crdn/service/CrdnStngService.java | 6 +- .../fims/crdn/service/bean/CrdnStngBean.java | 8 + .../service/bean/CrdnStngServiceBean.java | 5 + .../xit/fims/crdn/web/Crdn08Controller.java | 35 +- .../cokr/xit/fims/task/web/BpvController.java | 12 + .../mapper/fims/crdn/exmptn-vhcl-mapper.xml | 34 ++ .../WEB-INF/jsp/fims/crdn/crdn08010-main.jsp | 334 +++++++++++++++++- 9 files changed, 448 insertions(+), 16 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index ff971c77..59f0cb7c 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -38,6 +38,7 @@ public class CrdnQuery extends CmmnQuery { private String schCvlcptRcptYmdTo; private String schRductYmdFrom; private String schRductYmdTo; + private String crdnYmd; private String schCrdnYmdFrom; private String schCrdnYmdTo; private String schDmndYmdFrom; @@ -67,6 +68,7 @@ public class CrdnQuery extends CmmnQuery { //YN private String dstrbncYn; private String towngYn; + private String delYn; //기타 private String vhrno; @@ -154,6 +156,15 @@ public class CrdnQuery extends CmmnQuery { return self(); } + public String getDelYn() { + return ifEmpty(delYn, () -> null); + } + + public T setDelYn(String delYn) { + this.delYn = delYn; + return self(); + } + public String getVhrno() { return ifEmpty(vhrno, () -> null); } @@ -208,6 +219,15 @@ public class CrdnQuery extends CmmnQuery { return self(); } + public String getCrdnYmd() { + return ifEmpty(crdnYmd, () -> null); + } + + public T setCrdnYmd(String crdnYmd) { + this.crdnYmd = crdnYmd; + return self(); + } + public String getSchCrdnYmdFrom() { return ifEmpty(schCrdnYmdFrom, () -> null); } diff --git a/src/main/java/cokr/xit/fims/crdn/dao/ExmptnVhclMapper.java b/src/main/java/cokr/xit/fims/crdn/dao/ExmptnVhclMapper.java index ca3450bb..d32bc5c8 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/ExmptnVhclMapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/ExmptnVhclMapper.java @@ -1,10 +1,20 @@ package cokr.xit.fims.crdn.dao; +import java.util.List; + import org.egovframe.rte.psl.dataaccess.mapper.Mapper; +import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.foundation.component.AbstractMapper; +import cokr.xit.foundation.data.DataObject; @Mapper("exmptnVhclMapper") public interface ExmptnVhclMapper extends AbstractMapper { + /**면제차량 목록을 조회한다.
+ * @param query 면제차량 목록 조회 조건 + * @return 면제차량 목록 + */ + List selectExemptionVehicleList(CrdnQuery query); + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java index d9b6de62..dd59bd85 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java @@ -26,5 +26,9 @@ public interface CrdnStngService { */ DataObject getTeamInfo(String teamId); - + /** 면제차량 목록을 조회한다. + * @param query 면제차량 목록 조회 조건 + * @return 단속팀 목록 + */ + List getExemptionVehicleList(CrdnQuery query); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java index bdc2d64b..b8e955c4 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngBean.java @@ -232,4 +232,12 @@ public class CrdnStngBean extends AbstractComponent { return crdnTeamMapper.selectTeamInfo(teamId); } + /**면제차량 목록을 조회한다. + * @param query 면제차량 목록 조회조건 + * @return 면제차량 목록 + */ + public List selectExemptionVehicleList(CrdnQuery query) { + return exmptnVhclMapper.selectExemptionVehicleList(query); + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java index cae2c746..c49aa1d5 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnStngServiceBean.java @@ -38,4 +38,9 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng return crdnStngBean.selectTeamInfo(teamId); } + @Override + public List getExemptionVehicleList(CrdnQuery query) { + return crdnStngBean.selectExemptionVehicleList(query); + } + } diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java index 9585a200..09a27777 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java @@ -1,10 +1,18 @@ package cokr.xit.fims.crdn.web; +import java.util.List; +import java.util.Map; + import javax.annotation.Resource; import org.springframework.web.servlet.ModelAndView; +import cokr.xit.base.code.CommonCode; +import cokr.xit.base.user.ManagedUser; +import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.crdn.CrdnQuery; +import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.crdn.service.CrdnStngService; /**면제차량 관리 서비스 웹 컨트롤러.
@@ -17,13 +25,20 @@ public class Crdn08Controller extends ApplicationController { public class METHOD_URL { public static final String - exemptionVehicleManagementMain = "/010/main.do" + exemptionVehicleManagementMain = "/010/main.do" + , getExemptionVehicleList = "/010/list.do" ; } @Resource(name="crdnStngService") private CrdnStngService crdnStngService; + @Resource(name="userMapper") + private UserMapper userMapper; + + @Resource(name="globalStngMapper") + private GlobalStngMapper globalStngMapper; + /** 면제차량 관리 메인화면을 연다. * @return fims/crdn/crdn08010-main */ @@ -32,7 +47,25 @@ public class Crdn08Controller extends ApplicationController { mav.setViewName("fims/crdn/crdn08010-main"); mav.addObject("pageName", "crdn08010-main"); + Map> commonCodes = getCodesOf("FIM054"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); return mav; } + /**면제차량 목록을 조회한다.
+ * {@link CrdnStngService#getExemptionVehicleList(CrdnQuery)} 참고 + * @param query 면제차량 목록 조회 조건 + * @return jsonView + */ + public ModelAndView getExemptionVehicleList(CrdnQuery query) { + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnStngService.getExemptionVehicleList(query),""); + } + } diff --git a/src/main/java/cokr/xit/fims/task/web/BpvController.java b/src/main/java/cokr/xit/fims/task/web/BpvController.java index 00c6fc7f..ceb4107a 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -308,6 +308,18 @@ public class BpvController { } + @Controller + @RequestMapping(name="전용차로과태료업무 면제차량 관리", value=CLASS_URL+Crdn08Controller.CLASS_URL) + class Crdn08Controller extends cokr.xit.fims.crdn.web.Crdn08Controller { + + @Override + @RequestMapping(name="전용차로과태료업무 면제차량 목록 조회", value=METHOD_URL.getExemptionVehicleList) + public ModelAndView getExemptionVehicleList(CrdnQuery query) { + return super.getExemptionVehicleList(query); + } + + } + @Controller @RequestMapping(name="전용차로과태료업무 부과제외_부과제외관리", value=CLASS_URL+Excl01Controller.CLASS_URL) class Excl01Controller extends cokr.xit.fims.excl.web.Excl01Controller { diff --git a/src/main/resources/sql/mapper/fims/crdn/exmptn-vhcl-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/exmptn-vhcl-mapper.xml index 1c16872f..a07428d1 100644 --- a/src/main/resources/sql/mapper/fims/crdn/exmptn-vhcl-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/exmptn-vhcl-mapper.xml @@ -1,4 +1,38 @@ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp index c4b97ef7..6d06021a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp @@ -1,14 +1,320 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> - - - - -Insert title here - - -전용차로과태료 기능 준비중... - - - - \ No newline at end of file +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> +
+
+ 면제차량 관리 +
+
+
+
+ + + + +
+ +
+
+
+
+ + +
+
+ + +
+
+
+
+
+ +
+ +
    +
+
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
No.차량번호사유공문번호소유주명면제시작일면제종료일입력자입력일시수정자수정일시삭제자삭제사유삭제일시
+
+
+
+
+
+
+
+ + + +
+
+ \ No newline at end of file