From 45f2f4bbbd40c055a1483f59c7658856dc32fa7a Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Thu, 31 Aug 2023 12:59:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=88=EC=98=AC=EC=9A=94=EC=B2=AD=EC=9E=90?= =?UTF-8?q?=EB=A3=8C=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0?= =?UTF-8?q?=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 ++++ .../cvlc/dao/SaCvlcptIndviDmndMapper.java | 23 ++++++++ .../fims/cvlc/service/CrdnCvlcptService.java | 6 +++ .../cvlc/service/bean/CrdnCvlcptMainBean.java | 29 +++++++--- .../service/bean/CrdnCvlcptServiceBean.java | 5 ++ .../xit/fims/cvlc/web/Cvlc04Controller.java | 27 ++++++++-- .../cokr/xit/fims/task/web/BpvController.java | 12 +++++ .../cokr/xit/fims/task/web/DpvController.java | 12 +++++ .../cokr/xit/fims/task/web/EcaController.java | 12 +++++ .../cokr/xit/fims/task/web/PvsController.java | 12 +++++ .../fims/cvlc/saCvlcptIndviDmnd-mapper.xml | 30 +++++++++++ .../WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp | 54 ++++++++++--------- 12 files changed, 197 insertions(+), 36 deletions(-) create mode 100644 src/main/java/cokr/xit/fims/cvlc/dao/SaCvlcptIndviDmndMapper.java create mode 100644 src/main/resources/sql/mapper/fims/cvlc/saCvlcptIndviDmnd-mapper.xml diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index fe67af29..3d851f7f 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -39,6 +39,8 @@ public class CrdnQuery extends CmmnQuery { private String schRductYmdTo; private String schCrdnYmdFrom; private String schCrdnYmdTo; + private String schDmndYmdFrom; + private String schDmndYmdTo; //from, to private Integer schCrdnCntFrom; @@ -211,6 +213,15 @@ public class CrdnQuery extends CmmnQuery { return self(); } + public String getSchDmndYmdFrom() { + return ifEmpty(schDmndYmdFrom, () -> null); + } + + public T setSchDmndYmdFrom(String schDmndYmdFrom) { + this.schDmndYmdFrom = schDmndYmdFrom; + return self(); + } + public Integer getSchCrdnCntFrom() { return ifEmpty(schCrdnCntFrom, () -> null); } diff --git a/src/main/java/cokr/xit/fims/cvlc/dao/SaCvlcptIndviDmndMapper.java b/src/main/java/cokr/xit/fims/cvlc/dao/SaCvlcptIndviDmndMapper.java new file mode 100644 index 00000000..ce6921fd --- /dev/null +++ b/src/main/java/cokr/xit/fims/cvlc/dao/SaCvlcptIndviDmndMapper.java @@ -0,0 +1,23 @@ +package cokr.xit.fims.cvlc.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; + +/**새올 민원 개별 요청 관리 DAO + * @author leebj + */ +@Mapper("saCvlcptIndviDmndMapper") +public interface SaCvlcptIndviDmndMapper extends AbstractMapper { + + /**지정한 조건에 따라 새올요청자료 목록을 조회한다. + * @param crdnQuery 새올요청자료 목록 조회조건 + * @return 새올요청자료 목록 + */ + List selectDmndDataList(CrdnQuery query); + +} diff --git a/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java b/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java index 651a47db..5241ad67 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java @@ -109,4 +109,10 @@ public interface CrdnCvlcptService { */ boolean saveWarningWordsInfo(CrdnCvlcpt crdnCvlcpt); + /** 새올 요청자료 목록을 조회한다. + * @param query 조회 요청 + * @return 새올 요청자료 목록 + */ + List getDmndDataList(CrdnQuery query); + } diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java index a2467b84..7804c61d 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java @@ -20,6 +20,7 @@ import cokr.xit.fims.crdn.dao.GlobalStngMapper; import cokr.xit.fims.cvlc.CrdnCvlcpt; import cokr.xit.fims.cvlc.dao.AnswerWordsMapper; import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper; +import cokr.xit.fims.cvlc.dao.SaCvlcptIndviDmndMapper; import cokr.xit.foundation.AbstractComponent; import cokr.xit.foundation.UserInfo; import cokr.xit.foundation.data.DataObject; @@ -38,12 +39,21 @@ public class CrdnCvlcptMainBean extends AbstractComponent { @Resource(name = "codeMapper") private CodeMapper codeMapper; - @Resource(name = "answerWordsMapper") - private AnswerWordsMapper answerWordsMapper; + @Resource(name = "userMapper") + private UserMapper userMapper; + + @Resource(name="globalStngMapper") + protected GlobalStngMapper globalStngMapper; @Resource(name = "crdnCvlcptMapper") private CrdnCvlcptMapper crdnCvlcptMapper; + @Resource(name = "answerWordsMapper") + private AnswerWordsMapper answerWordsMapper; + + @Resource(name = "saCvlcptIndviDmndMapper") + SaCvlcptIndviDmndMapper saCvlcptIndviDmndMapper; + @Resource(name = "crdnInfoMapper") private CrdnInfoMapper crdnInfoMapper; @@ -53,12 +63,6 @@ public class CrdnCvlcptMainBean extends AbstractComponent { @Resource(name = "crdnUpdtMapper") private CrdnUpdtMapper crdnUpdtMapper; - @Resource(name = "userMapper") - private UserMapper userMapper; - - @Resource(name="globalStngMapper") - protected GlobalStngMapper globalStngMapper; - /**민원 원본 정보를 조회한다. * @param query 조회 요청 * @return 민원 원본 정보 @@ -317,4 +321,13 @@ public class CrdnCvlcptMainBean extends AbstractComponent { } } + + /**새올 요청 자료 목록을 조회한다. + * @param query 조회 요청 + * @return 새올 요청 자료 목록 + */ + public List selectDmndDataList(CrdnQuery query) { + return saCvlcptIndviDmndMapper.selectDmndDataList(query); + } + } diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index 36395fa7..ceda5a3b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -727,4 +727,9 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv return crdnCvlcptSubBean.saveWarningWordsInfo(crdnCvlcpt); } + @Override + public List getDmndDataList(CrdnQuery query) { + return crdnCvlcptMainBean.selectDmndDataList(query); + } + } diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java index d4b2e130..ef3418fb 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java @@ -9,6 +9,8 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; 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.CrdnService; import cokr.xit.fims.cvlc.service.CrdnCvlcptService; @@ -21,7 +23,8 @@ public class Cvlc04Controller extends ApplicationController { public static final String CLASS_URL = "/cvlc/cvlc04"; public class METHOD_URL { - + public static final String + getDmndDataList = "/010/list.do"; } @Resource(name="crdnService") @@ -30,6 +33,9 @@ public class Cvlc04Controller extends ApplicationController { @Resource(name="crdnCvlcptService") private CrdnCvlcptService crdnCvlcptService; + @Resource(name="globalStngMapper") + protected GlobalStngMapper globalStngMapper; + /** 민원 개별 등록 메인화면을 연다. * @return fims/cvlc/cvlc04010-main */ @@ -38,10 +44,25 @@ public class Cvlc04Controller extends ApplicationController { mav.setViewName("fims/cvlc/cvlc04010-main"); mav.addObject("pageName", "cvlc04010-main"); - Map> commonCodes = getCodesOf("FIM054"); + Map> commonCodes = getCodesOf("FIM054","FIM062","FIM063"); mav.addObject("FIM054List", commonCodes.get("FIM054")); - + addCodes(commonCodes, mav, "FIM062"); + addCodes(commonCodes, mav, "FIM063"); return mav; } + /** 새올 요청자료 목록을 조회한다. + * {@link CrdnCvlcService#getDmndDataList(CrdnQuery)} 참고 + * @param query 새올 요청자료 목록 조회 조건 + * @return jsonView + */ + public ModelAndView getDmndDataList(CrdnQuery query) { + + query.setSggCd(globalStngMapper.selectSggCdForCurrentUser()); + + setFetchSize(query); + return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getDmndDataList(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 0d6289f5..6f9aa2e6 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -114,6 +114,18 @@ public class BpvController { } + @Controller + @RequestMapping(name="전용차로과태료업무 민원개별등록 관리 업무", value=CLASS_URL+Cvlc04Controller.CLASS_URL) + class Cvlc04Controller extends cokr.xit.fims.cvlc.web.Cvlc04Controller { + + @Override + @RequestMapping(name="전용차로과태료업무 새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList) + public ModelAndView getDmndDataList(CrdnQuery query) { + return super.getDmndDataList(query); + } + + } + @Controller @RequestMapping(name="전용차로과태료업무 민원신고답변 문구 관리 업무", value=CLASS_URL+Cvlc05Controller.CLASS_URL) class Cvlc05Controller extends cokr.xit.fims.cvlc.web.Cvlc05Controller { diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java index e0b062ae..ff9c67f1 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -116,6 +116,18 @@ public class DpvController { } + @Controller + @RequestMapping(name="장애인과태료업무 민원개별등록 관리 업무", value=CLASS_URL+Cvlc04Controller.CLASS_URL) + class Cvlc04Controller extends cokr.xit.fims.cvlc.web.Cvlc04Controller { + + @Override + @RequestMapping(name="장애인과태료업무 새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList) + public ModelAndView getDmndDataList(CrdnQuery query) { + return super.getDmndDataList(query); + } + + } + @Controller @RequestMapping(name="장애인과태료업무 민원신고답변 문구 관리 업무", value=CLASS_URL+Cvlc05Controller.CLASS_URL) class Cvlc05Controller extends cokr.xit.fims.cvlc.web.Cvlc05Controller { diff --git a/src/main/java/cokr/xit/fims/task/web/EcaController.java b/src/main/java/cokr/xit/fims/task/web/EcaController.java index ea08e068..eae18aba 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -114,6 +114,18 @@ public class EcaController { } + @Controller + @RequestMapping(name="전기차과태료업무 민원개별등록 관리 업무", value=CLASS_URL+Cvlc04Controller.CLASS_URL) + class Cvlc04Controller extends cokr.xit.fims.cvlc.web.Cvlc04Controller { + + @Override + @RequestMapping(name="전기차과태료업무 새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList) + public ModelAndView getDmndDataList(CrdnQuery query) { + return super.getDmndDataList(query); + } + + } + @Controller @RequestMapping(name="전기차과태료업무 민원신고답변 문구 관리 업무", value=CLASS_URL+Cvlc05Controller.CLASS_URL) class Cvlc05Controller extends cokr.xit.fims.cvlc.web.Cvlc05Controller { 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 1b6e661a..3a9500e8 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -119,6 +119,18 @@ public class PvsController { } + @Controller + @RequestMapping(name="주정차과태료업무 민원개별등록 관리 업무", value=CLASS_URL+Cvlc04Controller.CLASS_URL) + class Cvlc04Controller extends cokr.xit.fims.cvlc.web.Cvlc04Controller { + + @Override + @RequestMapping(name="주정차과태료업무 새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList) + public ModelAndView getDmndDataList(CrdnQuery query) { + return super.getDmndDataList(query); + } + + } + @Controller @RequestMapping(name="주정차과태료업무 민원신고답변 문구 관리 업무", value=CLASS_URL+Cvlc05Controller.CLASS_URL) class Cvlc05Controller extends cokr.xit.fims.cvlc.web.Cvlc05Controller { diff --git a/src/main/resources/sql/mapper/fims/cvlc/saCvlcptIndviDmnd-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/saCvlcptIndviDmnd-mapper.xml new file mode 100644 index 00000000..6ddcb0fe --- /dev/null +++ b/src/main/resources/sql/mapper/fims/cvlc/saCvlcptIndviDmnd-mapper.xml @@ -0,0 +1,30 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp index 9ffc9507..20f6ef55 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp @@ -33,12 +33,12 @@
- ~ - @@ -82,21 +82,21 @@ 접수일자 목록번호 요청자 - 등록일시 + 응답일시 상태