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 a60f4ab0..49b9d6ed 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -40,7 +40,7 @@ public class Crdn06Controller extends ApplicationController { crackdownManagementMain = "/010/main.do" , getCrackdownList = "/010/list.do" , removeCrackdown = "/010/remove.do" - , countCrdn = "/010/countCrdn.do" + , countCrdn = "/010/nocs.do" , getCrackdownInfo = "/020/info.do" , updateCrackdown = "/020/update.do" , getCrackdownStatusInfo = "/030/info.do" diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java index 4dcb6616..5e899304 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java @@ -43,6 +43,7 @@ public class Sprt04Controller extends ApplicationController { public static final String civilComplaintDiscussionMain = "/010/main.do" // 민원 상담 관리 메인 화면 , getCvlcptDscsnList = "/010/list.do" // 민원 상담 내용 대장 목록 조회 + , getCvlcptDscsnNocs = "/010/nocs.do" // 민원 상담 내용 건수 조회 , getCvlcptDscsnInfo = "/020/info.do" // 민원 상담 내용 정보 조회 , createCvlcptDscsn = "/020/create.do" // 민원 상담 내용 대장 등럭 , updateCvlcptDscsn = "/020/update.do" // 민원 상담 내용 대장 수정 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 8dcac925..febe8c36 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -633,6 +633,12 @@ public class BpvController { return super.getCvlcptDscsnList(req); } + @Override + @RequestMapping(name="전용차로과태료업무 민원 상담 내용 건수 조회", value=METHOD_URL.getCvlcptDscsnNocs) + public ModelAndView getCvlcptDscsnNocs(CvlcptDscsnQuery req) { + return super.getCvlcptDscsnNocs(req); + } + @Override @RequestMapping(name="전용차로과태료업무 민원 상담 내용 정보 조회", value=METHOD_URL.getCvlcptDscsnInfo) public ModelAndView getCvlcptDscsnInfo(CvlcptDscsnQuery req) { 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 43d1ff1d..b29f9c6b 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -883,6 +883,12 @@ public class DpvController { return super.getCvlcptDscsnList(req); } + @Override + @RequestMapping(name="민원 상담 내용 건수 조회", value=METHOD_URL.getCvlcptDscsnNocs) + public ModelAndView getCvlcptDscsnNocs(CvlcptDscsnQuery req) { + return super.getCvlcptDscsnNocs(req); + } + @Override @RequestMapping(name="민원상담내용 정보 조회", value=METHOD_URL.getCvlcptDscsnInfo) public ModelAndView getCvlcptDscsnInfo(CvlcptDscsnQuery req) { 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 61b8bf92..46d53f33 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -540,6 +540,12 @@ public class EcaController { return super.getCvlcptDscsnList(req); } + @Override + @RequestMapping(name="전기차과태료업무 민원 상담 내용 건수 조회", value=METHOD_URL.getCvlcptDscsnNocs) + public ModelAndView getCvlcptDscsnNocs(CvlcptDscsnQuery req) { + return super.getCvlcptDscsnNocs(req); + } + @Override @RequestMapping(name="전기차과태료업무 민원 상담 내용 정보 조회", value=METHOD_URL.getCvlcptDscsnInfo) public ModelAndView getCvlcptDscsnInfo(CvlcptDscsnQuery req) { 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 ec2ac685..f0b0619c 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -603,6 +603,12 @@ public class PvsController { return super.getCvlcptDscsnList(req); } + @Override + @RequestMapping(name="주정차과태료업무 민원 상담 내용 건수 조회", value=METHOD_URL.getCvlcptDscsnNocs) + public ModelAndView getCvlcptDscsnNocs(CvlcptDscsnQuery req) { + return super.getCvlcptDscsnNocs(req); + } + @Override @RequestMapping(name="주정차과태료업무 민원 상담 내용 정보 조회", value=METHOD_URL.getCvlcptDscsnInfo) public ModelAndView getCvlcptDscsnInfo(CvlcptDscsnQuery req) { diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index dc74b8db..40229e94 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -447,6 +447,7 @@ SELECT C.CRDN_ID FROM TB_CRDN C LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) WHERE C.DEL_YN = 'N' + AND C.SGG_CD = #{sggCd} AND C.CRDN_STTS_CD != '01' AND C.TASK_SE_CD = #{taskSeCd} AND C.VHRNO = #{vhrno} diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index 06cc4322..8817520f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -905,10 +905,11 @@ $(document).ready(function(){ return; } - + var sggCd = $("#sggCd--${pageName}").val(); var resp = null; - resp = await countCrdnByVhrno(vhrno, "${taskSeCd}"); + // + resp = await countCrdnByVhrno(vhrno, "${taskSeCd}", sggCd); if(resp.crdnCount > 0){ $("#outputCrdnCount--${pageName}").html(resp.crdnCount); $("#btnViewCrdnList--${pageName}").removeAttr("hidden"); @@ -916,7 +917,17 @@ $(document).ready(function(){ $("#btnViewCrdnList--${pageName}").attr("hidden","hidden"); } - resp = await getVhclInfo($("#sggCd--${pageName}").val(), vhrno, crdnYmd); + // + resp = await countCvlcptDscsnByVhrno(vhrno, "${taskSeCd}", sggCd); + if(resp.cvlcptDscsnNocs.NOCS > 0){ + $("#outputCvlcptDscsnCount--${pageName}").html(resp.cvlcptDscsnNocs.NOCS); + $("#btnViewCvlcptDscsnList--${pageName}").removeAttr("hidden"); + } else { + $("#btnViewCvlcptDscsnList--${pageName}").attr("hidden","hidden"); + } + + // + resp = await getVhclInfo(sggCd, vhrno, crdnYmd); if(!resp.found){ dialog.alert({ diff --git a/src/main/webapp/resources/js/fims/framework/cmm/searchUtil.js b/src/main/webapp/resources/js/fims/framework/cmm/searchUtil.js index 5cc58e42..2d8f6cae 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/searchUtil.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/searchUtil.js @@ -19,13 +19,35 @@ function searchFromGridTitle(byValue, byOutputValue, mainOption, subOption){ /************************************************************************** * 차량번호로 단속 건수 조회 **************************************************************************/ -async function countCrdnByVhrno(vhrno, taskSeCd){ +async function countCrdnByVhrno(vhrno, taskSeCd, sggCd){ return new Promise((resolve, reject) => { json.get({ - url: wctx.url("/"+taskSeCd+"/crdn/crdn06/010/countCrdn.do"), + url: wctx.url("/"+taskSeCd+"/crdn/crdn06/010/nocs.do"), data: { vhrno : vhrno, - taskSeCd : taskSeCd + taskSeCd : taskSeCd, + sggCd : sggCd + }, + success: function(resp, textStatus, jqXHR) { + resolve(resp); + }, + error: function(jqXHR, textStatus, error) { + } + }); + }); +} + +/************************************************************************** +* 차량번호로 민원상담 건수 조회 +**************************************************************************/ +async function countCvlcptDscsnByVhrno(vhrno, taskSeCd, sggCd){ + return new Promise((resolve, reject) => { + json.get({ + url: wctx.url("/"+taskSeCd+"/sprt/sprt04/010/nocs.do"), + data: { + vhrno : vhrno, + taskSeCd : taskSeCd, + sggCd : sggCd }, success: function(resp, textStatus, jqXHR) { resolve(resp);