From ad43bc0a578463e2a9fc49775887906b3f24ba9f Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 20 Oct 2023 17:37:41 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=ED=8C=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=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 | 11 +- .../xit/fims/crdn/dao/CrdnTeamMapper.java | 6 + .../fims/crdn/service/CrdnStngService.java | 6 + .../fims/crdn/service/bean/CrdnStngBean.java | 9 + .../service/bean/CrdnStngServiceBean.java | 5 + .../xit/fims/crdn/web/Crdn07Controller.java | 58 ++- .../cokr/xit/fims/task/web/BpvController.java | 12 + .../cokr/xit/fims/task/web/PvsController.java | 12 + .../sql/mapper/fims/crdn/crdn-team-mapper.xml | 43 +- .../WEB-INF/jsp/fims/crdn/crdn07010-main.jsp | 469 +++++++++++++++++- 10 files changed, 605 insertions(+), 26 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 59f0cb7c..35bea6a8 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -73,7 +73,7 @@ public class CrdnQuery extends CmmnQuery { //기타 private String vhrno; private String cvlcptPrcsPicNm; - + private String teamNm; public String getGridType() { return ifEmpty(gridType, () -> null); @@ -183,6 +183,15 @@ public class CrdnQuery extends CmmnQuery { return self(); } + public String getTeamNm() { + return ifEmpty(teamNm, () -> null); + } + + public T setTeamNm(String teamNm) { + this.teamNm = teamNm; + return self(); + } + public String getSchCvlcptRcptYmdFrom() { return ifEmpty(schCvlcptRcptYmdFrom, () -> null); } diff --git a/src/main/java/cokr/xit/fims/crdn/dao/CrdnTeamMapper.java b/src/main/java/cokr/xit/fims/crdn/dao/CrdnTeamMapper.java index a491ac6d..907d9b03 100644 --- a/src/main/java/cokr/xit/fims/crdn/dao/CrdnTeamMapper.java +++ b/src/main/java/cokr/xit/fims/crdn/dao/CrdnTeamMapper.java @@ -17,6 +17,12 @@ public interface CrdnTeamMapper extends AbstractMapper { */ List selectTeamList(CrdnQuery query); + /**비사용 단속팀 목록을 조회한다.
+ * @param query 비사용 단속팀 목록 조회 조건 + * @return 비사용 단속팀 목록 + */ + List selectRemovedTeamList(CrdnQuery query); + /**단속팀 정보를 조회한다.
* @param teamId 단속팀 ID * @return 단속팀 정보 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 299fc67e..08350373 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnStngService.java @@ -21,6 +21,12 @@ public interface CrdnStngService { */ List getTeamList(CrdnQuery query); + /** 비사용 단속팀 목록을 조회한다. + * @param query 비사용 단속팀 목록 조회 조건 + * @return 비사용 단속팀 목록 + */ + List getRemovedTeamList(CrdnQuery query); + /** 단속팀 정보을 조회한다. * @param teamId 단속팀 ID * @return 단속팀 정보 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 3451e136..44e23d52 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 @@ -225,6 +225,14 @@ public class CrdnStngBean extends AbstractComponent { return crdnTeamMapper.selectTeamList(query); } + /**비사용 단속팀 목록을 조회한다. + * @param query 비사용 단속팀 목록 조회조건 + * @return 비사용 단속팀 목록 + */ + public List selectRemovedTeamList(CrdnQuery query) { + return crdnTeamMapper.selectRemovedTeamList(query); + } + /**단속팀 정보를 조회한다. * @param teamId 단속팀 ID * @return 단속팀 정보 @@ -299,4 +307,5 @@ public class CrdnStngBean extends AbstractComponent { return exmptnVhclMapper.selectExemptionVehicleHistoryList(exmptnVhclId); } + } 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 1344bb55..ce082c0d 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 @@ -34,6 +34,11 @@ public class CrdnStngServiceBean extends AbstractServiceBean implements CrdnStng return crdnStngBean.selectTeamList(query); } + @Override + public List getRemovedTeamList(CrdnQuery query) { + return crdnStngBean.selectRemovedTeamList(query); + } + @Override public DataObject getTeamInfo(String teamId) { return crdnStngBean.selectTeamInfo(teamId); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java index 42aab5ad..a45f097c 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.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,14 +25,22 @@ public class Crdn07Controller extends ApplicationController { public class METHOD_URL { public static final String - crackdownTeamManagementMain = "/010/main.do", - getTeamInfo = "/010/list.do" + crackdownTeamManagementMain = "/010/main.do" + , getTeamList = "/010/list.do" + , getRemovedTeamList = "/010/removedTeamList.do" + , getTeamInfo = "/010/info.do" ; } @Resource(name="crdnStngService") private CrdnStngService crdnStngService; + @Resource(name="globalStngMapper") + protected GlobalStngMapper globalStngMapper; + + @Resource(name="userMapper") + protected UserMapper userMapper; + /** 단속팀 관리 메인화면을 연다. * @return fims/crdn/crdn07010-main */ @@ -33,10 +49,48 @@ public class Crdn07Controller extends ApplicationController { mav.setViewName("fims/crdn/crdn07010-main"); mav.addObject("pageName", "crdn07010-main"); + Map> commonCodes = getCodesOf("FIM054","FIM071","FIM002"); + mav.addObject("FIM054List", commonCodes.get("FIM054")); + mav.addObject("FIM071List", commonCodes.get("FIM071")); + mav.addObject("FIM002List", commonCodes.get("FIM002")); + addCodes(commonCodes, mav, "FIM054"); + addCodes(commonCodes, mav, "FIM071"); + addCodes(commonCodes, mav, "FIM002"); return mav; } /**단속팀 목록을 조회한다.
+ * {@link CrdnStngService#getTeamList(query)} 참고 + * @param crdn 단속 + * @return jsonView + */ + public ModelAndView getTeamList(CrdnQuery query) { + ModelAndView mav = new ModelAndView("jsonView"); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + return setCollectionInfo(new ModelAndView("jsonView"), crdnStngService.getTeamList(query),""); + } + + /**비사용 단속팀 목록을 조회한다.
+ * {@link CrdnStngService#getRemovedTeamList(query)} 참고 + * @param crdn 단속 + * @return jsonView + */ + public ModelAndView getRemovedTeamList(CrdnQuery query) { + ModelAndView mav = new ModelAndView("jsonView"); + + ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + String curDeptCode = currentUser.getDeptCode(); + String sggCd = globalStngMapper.selectSggCd(curDeptCode); + query.setSggCd(sggCd); + + return setCollectionInfo(new ModelAndView("jsonView"), crdnStngService.getRemovedTeamList(query),""); + } + + /**단속팀 정보를 조회한다.
* {@link CrdnStngService#getTeamInfo(String)} 참고 * @param crdn 단속 * @return jsonView 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 e6c46226..47ec16b7 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -301,6 +301,18 @@ public class BpvController { @RequestMapping(name="전용차로과태료업무 단속팀 관리", value=CLASS_URL+Crdn07Controller.CLASS_URL) class Crdn07Controller extends cokr.xit.fims.crdn.web.Crdn07Controller { + @Override + @RequestMapping(name="전용차로과태료업무 단속팀 목록 조회", value=METHOD_URL.getTeamList) + public ModelAndView getTeamList(CrdnQuery query) { + return super.getTeamList(query); + } + + @Override + @RequestMapping(name="전용차로과태료업무 비사용 단속팀 목록 조회", value=METHOD_URL.getRemovedTeamList) + public ModelAndView getRemovedTeamList(CrdnQuery query) { + return super.getRemovedTeamList(query); + } + @Override @RequestMapping(name="전용차로과태료업무 단속팀 정보 조회", value=METHOD_URL.getTeamInfo) public ModelAndView getTeamInfo(String teamId) { diff --git a/src/main/java/cokr/xit/fims/task/web/PvsController.java b/src/main/java/cokr/xit/fims/task/web/PvsController.java index 65d8bcb6..0fbfcb47 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -313,6 +313,18 @@ public class PvsController { @RequestMapping(name="주정차과태료업무 단속팀 관리", value=CLASS_URL+Crdn07Controller.CLASS_URL) class Crdn07Controller extends cokr.xit.fims.crdn.web.Crdn07Controller { + @Override + @RequestMapping(name="주정차과태료업무 단속팀 목록 조회", value=METHOD_URL.getTeamList) + public ModelAndView getTeamList(CrdnQuery query) { + return super.getTeamList(query); + } + + @Override + @RequestMapping(name="주정차과태료업무 비사용 단속팀 목록 조회", value=METHOD_URL.getRemovedTeamList) + public ModelAndView getRemovedTeamList(CrdnQuery query) { + return super.getRemovedTeamList(query); + } + @Override @RequestMapping(name="주정차과태료업무 단속팀 정보 조회", value=METHOD_URL.getTeamInfo) public ModelAndView getTeamInfo(String teamId) { diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-team-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-team-mapper.xml index 7ff87b55..59bd3027 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-team-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-team-mapper.xml @@ -4,15 +4,40 @@ + + + ${item.value} + + + + + + + + + + +
+ +
+ +
    +
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + +
단속조단속구분단속원1단속원2단속원3단속원4특이사항등록일
+
+
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+ + + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
단속조단속구분단속원1단속원2단속원3단속원4특이사항등록일해체일
+
+
+
+ + + + + + + +
+ + + +