diff --git a/src/main/java/kr/xit/fims/biz/ec/web/EcCctvCrackdownController.java b/src/main/java/kr/xit/fims/biz/ec/web/EcCctvCrackdownController.java index e5a90eca..960740f3 100644 --- a/src/main/java/kr/xit/fims/biz/ec/web/EcCctvCrackdownController.java +++ b/src/main/java/kr/xit/fims/biz/ec/web/EcCctvCrackdownController.java @@ -46,26 +46,7 @@ public class EcCctvCrackdownController extends AbstractController { private final CmmFileService fileService; - @RequestMapping(name = "", value = "/ecCctvCrackdownFileSelPopup") - public ModelAndView ecCctvCrackdownFileSelPopup(){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecCctvCrackdownFileSelPopup.popup"); - mav.addObject("busInstallDirPath", fileRcvRoot + rcvBusinstallCctvPath); - mav.addObject("ctznDirPath", fileRcvRoot + rcvNatlNewspaperPath); - return mav; - } - - @RequestMapping(name = "", value = "/ecCctvCrackdownPopup") - public ModelAndView ecCctvCrackdownPopup(final CctvCrackdownDTO.Request dto){ - ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecCctvCrackdownPopup.popup"); - mav.addObject("extrDTO", service.findExtrlRegltCntc(dto.getFileLinkId())); - mav.addObject("attchFiles", fileService.findFilesByJobSeCodeAndJobId( - CmmFileDTO.FileMst.builder() - .jobSeCode(FimsBizUtils.getFileJobSeCode(dto.getCrdnSeCd())) - .fileJobId(dto.getFileLinkId()) - .build())); - return mav; - } @GetMapping(name = "", value = "/findExtrlRegltCntcs") public ModelAndView findExtrlRegltCntcs(@RequestParam final Map paraMap) { diff --git a/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml index 8a8047c4..93b63d09 100644 --- a/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml @@ -15,7 +15,7 @@ , vhrno , crdn_ymd , crdn_bgng_tm - , crdn_end_hr + , crdn_end_tm , crdn_stdg_nm , crdn_plc , crdn_sparea_nm diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp index 363726ca..591515c4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp @@ -98,6 +98,20 @@ Date Author Description + + GPS위도 + + + + GPS경도 + + + + 처리상태 + + + + 신고자 @@ -123,13 +137,18 @@ Date Author Description - - 시군구 + 위반내역 + + ' readonly> + + + + 시군구명 - 법정동 + 법정동명 @@ -229,7 +248,13 @@ Date Author Description + + 등록일시 + + + + @@ -630,6 +655,17 @@ Date Author Description ,data: $("#frm").serialize() }); } + ,erpp: (fileLinkId) => { + const data = { + fileLinkId + ,crdnSeCd: '' + } + if(!confirm('서손 처리 하시겠습니까?')) return false; + cmmAjax({ + url: fimsApiUrl.SAVE_EC_EXTRL_REGLT_CNTC_RT_ERPP + ,data: $.param(data) + }) + } // 차량 단속 건수 표시 ,showCrackdownVhrnoCnt: (cnt) => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp deleted file mode 100644 index 53448b97..00000000 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp +++ /dev/null @@ -1,325 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> -<%@ include file="/WEB-INF/jsp/include/fims/taglib.jsp" %> - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp deleted file mode 100644 index baceb39d..00000000 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp +++ /dev/null @@ -1,260 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> -<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> -<%@ include file="/WEB-INF/jsp/include/fims/taglib.jsp" %> - -
- -
- - -
- -
전체 ㅣ
-
- - 등록 - -
- - - -
-
- -
    -
    - - - diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp deleted file mode 100644 index a180f6f0..00000000 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp +++ /dev/null @@ -1,344 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> -<%@ include file="/WEB-INF/jsp/include/fims/taglib.jsp" %> - -<%--rcvXmlDTO--%> - - - - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp index 306f74ef..204450d5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp @@ -24,6 +24,7 @@ Date Author Description
    + diff --git a/src/main/webapp/resources/js/fims/biz/common/fimsApiURL.js b/src/main/webapp/resources/js/fims/biz/common/fimsApiURL.js index 42474500..d036e96d 100644 --- a/src/main/webapp/resources/js/fims/biz/common/fimsApiURL.js +++ b/src/main/webapp/resources/js/fims/biz/common/fimsApiURL.js @@ -55,8 +55,8 @@ const fimsApiUrl = { //외부연계처리 - CCTV 데이타 관리(cctv고정형 / 이동형 / 버스장착형) - ,POPUP_CCTV_EC_EXTRL_REGLT_CNTC_INFO: '/fims/biz/ec/ecCctvCrackdownPopup.do' //CCTV 외부연계 데이타 상세 - ,POPUP_CCTV_EC_EXTRL_REGLT_CNTC_DATA_SEL: '/fims/biz/ec/ecCctvCrackdownFileSelPopup.do' //CCTV 외부연계 데이타 선택 + + ,FIND_CCTV_EC_EXTRL_REGLT_CNTCS: '/fims/biz/ec/findExtrlRegltCntcs.do' //CCTV 외부연계 데이타 목록 조회 ,FIND_CCTV_EC_EXTRL_REGLT_CNTC: '/fims/biz/ec/findExtrlRegltCntc.do' //CCTV 외부연계 데이타 목록 조회 ,FIND_CCTV_EC_EXTRL_REGLT_CNTC_AND_ATTCH_FILES: '/fims/biz/ec/findExtrlRegltCntcAndAttchFiles.do' //CCTV 외부연계 정보 및 첨부파일 조회