소스정리

src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java

@@ -10,8 +10,10 @@ 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.CrdnInfoMapper;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.crdn.service.CrdnStngService;
+import cokr.xit.foundation.data.DataObject;
 
 /**단속자료검사 서비스 웹 컨트롤러.<br />
  * {웹 컨텍스트}/crdn/crdn02 로 접근할 수 있다.
@@ -36,6 +38,9 @@ public class Crdn02Controller extends ApplicationController {
 	@Resource(name="crdnStngService")
 	private CrdnStngService crdnStngService;
 
+	@Resource(name="crdnInfoMapper")
+	private CrdnInfoMapper crdnInfoMapper;
+
 	/** 단속 자료 검사 메인화면을 연다.
 	 * @return fims/crdn/crdn02010-main
 	 */
@@ -69,4 +74,34 @@ public class Crdn02Controller extends ApplicationController {
 		setFetchSize(query);
 		return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"");
 	}
+
+	/**2시간 초과처리 팝업을 호출한다.<br />
+	 * @param crdnId 단속 ID
+	 * @return crdn02050-info
+	 */
+	public ModelAndView getOverTimeInfo(String openerPageName, String savedCallbackFuncName, String crdnId) {
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName("fims/crdn/crdn02050-info");
+		mav.addObject("pageName","crdn02050-info");
+
+		DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdnId);
+
+		mav.addObject("crdnInfo", toJson(crdnInfo));
+		mav.addObject("openerPageName", openerPageName);
+		mav.addObject("savedCallbackFuncName", savedCallbackFuncName);
+		return mav;
+	}
+
+	/**단속자료의 2시간 초과여부를 변경하고, 금액을 수정한다. <br />
+	 * @param chgAmtSe 금액 변경 구분, crdnId 단속 ID
+	 * @return jsonView
+	 * <pre><code> {
+	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
+	 * }</code></pre>
+	 */
+	public ModelAndView updateOverTimeInfo(String chgAmtSe, String crdnId) {
+		boolean saved = crdnService.updateOverTimeInfo(chgAmtSe, crdnId);
+		return new ModelAndView("jsonView")
+			.addObject("saved", saved);
+	}
 }

src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.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.Crdn;
+import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.crdn.service.CrdnStngService;
 
@@ -47,4 +49,29 @@ public class Crdn03Controller extends ApplicationController {
 		return mav;
 	}
 
+	/**표지정보미확인자료 목록을 조회한다.<br />
+	 * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고
+	 * @param req 표지정보미확인자료 목록 조회 조건
+	 * @return jsonView
+	 */
+	public ModelAndView getTagInformationUndefinedDataList(CrdnQuery query) {
+		query.setGridType("tagInformationUndefinedData");
+		setFetchSize(query);
+		return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"");
+	}
+
+	/**표지정보 미확인 자료를 수정한다.
+	 * @param crdn 단속 대장 정보
+	 * @return jsonView
+	 * <pre><code> {
+	 *     "saved": 수정되었으면 true, 그렇지 않으면 false
+	 * }</code></pre>
+	 */
+	public ModelAndView updateTagInfo(Crdn crdn) {
+
+		boolean saved = crdnService.updateTagInfo(crdn);
+		return new ModelAndView("jsonView")
+			.addObject("saved", saved);
+	}
+
 }

src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java

@@ -126,4 +126,10 @@ public interface CrdnCvlcptService {
 	 * @return 저장여부
 	 */
 	boolean removeDmndDataInfo(String... indivIDs);
+
+	/** 지정한 단속자료에 대해 표지정보조회 실행 후 장애인차량이 아닌 건은 서손 처리한다.
+	 * @param crdnIDs 단속 ID 목록
+	 * @return 저장여부
+	 */
+	boolean executeDisabledTagInfoInquire(String... crdnIDs);
 }

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java

@@ -741,4 +741,14 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 		return crdnCvlcptMainBean.removeDmndDataInfo(indivIDs);
 	}
 
+	@Override
+	public boolean executeDisabledTagInfoInquire(String... crdnIDs) {
+
+		// for
+		// TODO 연계
+		// TODO 서손처리
+
+		return false;
+	}
+
 }

src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java

@@ -29,6 +29,7 @@ public class Cvlc02Controller extends ApplicationController {
 		civilComplaintAnswerTargetDataMain = "/010/main.do",
 		selectCivilComplaintAnswerTargetDataList = "/030/list.do",
 		updateAnswerTargetProcessStatus = "/030/update.do",
+		executeDisabledTagInfoInquire = "/040/update.do",
 		answerPreviewInfo = "/060/info.do",
 		updateAnswerContent = "/060/update.do"
 		;
@@ -123,4 +124,21 @@ public class Cvlc02Controller extends ApplicationController {
 		return new ModelAndView("jsonView")
 			.addObject("saved", saved);
 	}
+
+	/**지정한 단속자료에 대해 표지정보조회 실행 후 장애인차량이 아닌 건은 서손 처리한다.
+	 * @param crdnIDs 단속ID 목록
+	 * @return jsonView
+	 * <pre><code> {
+	 *     "affected": 저장된 정보수
+	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
+	 * }</code></pre>
+	 */
+	public ModelAndView executeDisabledTagInfoInquire(String... crdnIDs) {
+		boolean saved = false;
+
+		saved = crdnCvlcptService.executeDisabledTagInfoInquire(crdnIDs);
+
+		return new ModelAndView("jsonView")
+			.addObject("saved", saved);
+	}
 }

src/main/java/cokr/xit/fims/task/web/DpvController.java

@@ -1,6 +1,5 @@
 package cokr.xit.fims.task.web;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
@@ -10,7 +9,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.cvlc.CrdnCvlcpt;
 import cokr.xit.fims.sprt.SprtQuery;
 
@@ -101,6 +99,12 @@ public class DpvController {
 			return super.updateAnswerTargetProcessStatus(processType, crdnIDs);
 		}
 
+		@Override
+		@RequestMapping(name="장애인과태료업무 표지정보조회 실행", value=METHOD_URL.executeDisabledTagInfoInquire)
+		public ModelAndView executeDisabledTagInfoInquire(String... crdnIDs) {
+			return super.executeDisabledTagInfoInquire(crdnIDs);
+		}
+
 	}
 
 	@Controller
@@ -197,33 +201,16 @@ public class DpvController {
 	@RequestMapping(name="장애인과태료업무 표지정보확인 업무", value=CLASS_URL+Crdn03Controller.CLASS_URL)
 	class Crdn03Controller extends cokr.xit.fims.crdn.web.Crdn03Controller {
 
-		@Resource(name="crdnService")
+		@Override
-		private CrdnService crdnService;
-
-		/**표지정보미확인자료 목록을 조회한다.<br />
-		 * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고
-		 * @param req 표지정보미확인자료 목록 조회 조건
-		 * @return jsonView
-		 */
 		@RequestMapping(name="장애인과태료업무 표지정보미확인자료 목록", value=METHOD_URL.getTagInformationUndefinedDataList)
 		public ModelAndView getTagInformationUndefinedDataList(CrdnQuery query) {
-			query.setGridType("tagInformationUndefinedData");
+			return super.getTagInformationUndefinedDataList(query);
-			setFetchSize(query);
-			return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"");
 		}
 
-		/**표지정보 미확인 자료를 수정한다.
+		@Override
-		 * @param crdn 단속 대장 정보
-		 * @return jsonView
-		 * <pre><code> {
-		 *     "saved": 수정되었으면 true, 그렇지 않으면 false
-		 * }</code></pre>
-		 */
 		@RequestMapping(name = "표지정보 미확인 자료 수정", value=METHOD_URL.updateTagInfo)
-		public ModelAndView update(Crdn crdn) {
+		public ModelAndView updateTagInfo(Crdn crdn) {
-			boolean saved = crdnService.updateTagInfo(crdn);
+			return super.updateTagInfo(crdn);
-			return new ModelAndView("jsonView")
-				.addObject("saved", saved);
 		}
 
 	}

src/main/java/cokr/xit/fims/task/web/PvsController.java

@@ -1,6 +1,5 @@
 package cokr.xit.fims.task.web;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
@@ -10,11 +9,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.dao.CrdnInfoMapper;
-import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.cvlc.CrdnCvlcpt;
 import cokr.xit.fims.sprt.SprtQuery;
-import cokr.xit.foundation.data.DataObject;
 
 
 @Controller
@@ -188,49 +184,22 @@ public class PvsController {
 	@RequestMapping(name="주정차과태료업무 단속자료검사 업무", value=CLASS_URL+Crdn02Controller.CLASS_URL)
 	class Crdn02Controller extends cokr.xit.fims.crdn.web.Crdn02Controller {
 
-		@Resource(name="crdnService")
-		private CrdnService crdnService;
-
-		@Resource(name="crdnInfoMapper")
-		private CrdnInfoMapper crdnInfoMapper;
-
 		@Override
 		@RequestMapping(name="주정차과태료업무 검사자료 목록 조회", value=METHOD_URL.getInspectionDataList)
 		public ModelAndView getInspectionDataList(CrdnQuery query) {
 			return super.getInspectionDataList(query);
 		}
 
-		/**2시간 초과처리 팝업을 호출한다.<br />
+		@Override
-		 * @param crdnId 단속 ID
-		 * @return crdn02050-info
-		 */
 		@RequestMapping(name="2시간 초과 처리 화면 호출", value=METHOD_URL.getOverTimeInfo)
 		public ModelAndView getOverTimeInfo(String openerPageName, String savedCallbackFuncName, String crdnId) {
-
+			return super.getOverTimeInfo(openerPageName, savedCallbackFuncName, crdnId);
-			ModelAndView mav = new ModelAndView();
-			mav.setViewName("fims/crdn/crdn02050-info");
-			mav.addObject("pageName","crdn02050-info");
-
-			DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdnId);
-
-			mav.addObject("crdnInfo", toJson(crdnInfo));
-			mav.addObject("openerPageName", openerPageName);
-			mav.addObject("savedCallbackFuncName", savedCallbackFuncName);
-			return mav;
 		}
 
-		/**단속자료의 2시간 초과여부를 변경하고, 금액을 수정한다. <br />
+		@Override
-		 * @param chgAmtSe 금액 변경 구분, crdnId 단속 ID
-		 * @return jsonView
-		 * <pre><code> {
-		 *     "saved": 수정되었으면 true, 그렇지 않으면 false
-		 * }</code></pre>
-		 */
 		@RequestMapping(name = "2시간 초과 정보 수정", value=METHOD_URL.updateOverTimeInfo)
 		public ModelAndView updateOverTimeInfo(String chgAmtSe, String crdnId) {
-			boolean saved = crdnService.updateOverTimeInfo(chgAmtSe, crdnId);
+			return super.updateOverTimeInfo(chgAmtSe, crdnId);
-			return new ModelAndView("jsonView")
-				.addObject("saved", saved);
 		}
 
 	}

src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml

@@ -584,6 +584,7 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
         THEN 'Y'
         ELSE 'N'
         END) AS COPY_EXIST_YN                         <!-- 복사 자료 존재 여부 -->
+     , CC.CVLCPT_PRCS_CD                              <!-- 처리 구분 코드 -->
   FROM TB_CRDN C
   INNER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID)
   LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N')

src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp

@@ -74,11 +74,23 @@
 				                 <ul id="crdnPaging--${pageName}" class="pagination pagination-primary">
 				                 </ul>
 							</div>
-				            <span class="container-window-btn-right">
+				            <span id="gridbuttonArea--${pageName}" class="container-window-btn-right">
-				            	<button type="button" id="btnOpenCvlcptOrgnl--${pageName}" class="btn btn-primary" title="민원원본보기">민원원본보기</button>
+				            	<button type="button" id="btnOpenCvlcptOrgnl--${pageName}" 
-				            	<button type="button" id="btnOpenAnswerPreview--${pageName}" class="btn btn-primary" title="답변미리보기">답변미리보기</button>
+				            	class="btn btn-primary" title="민원원본보기">민원원본보기</button>
-				            	<button type="button" id="btnAnswerExecute--${pageName}" class="btn btn-primary" title="답변등록 실행">&#x2611; 답변등록 실행</button>
+				            	<button type="button" id="btnOpenAnswerPreview--${pageName}" 
-				            	<button type="button" id="btnAnswerComplete--${pageName}" class="btn btn-primary" title="답변완료로 수정">&#x2611; 답변완료로 수정</button>
+				            	class="btn btn-primary" title="답변미리보기">답변미리보기</button>
+				            	<button type="button" id="btnExecuteAnswer--${pageName}" 
+				            	class="btn btn-primary" title="답변등록 실행">&#x2611; 답변등록 실행</button>
+				            	<button type="button" id="btnAnswerComplete--${pageName}" 
+				            	class="btn btn-primary" title="답변완료로 수정">&#x2611; 답변완료로 수정</button>
+				            	<span slot="button">
+									<template class="dpv">
+										<slot>
+											<button type="button" id="btnExecuteDisabledTagInfoInquire--${pageName}"
+				            				class="btn btn-primary" title="표지정보 조회">&#x2611; 표지정보 조회</button>
+										</slot>
+									</template>
+								</span>
 				            </span>
 				        </span>
 				    </div>
@@ -284,8 +296,9 @@ $(document).ready(function(){
 			checkbox.prop("checked", keys.includes(checkbox.val()));
 		});
 		
-		$("#btnAnswerExecute--${pageName}").prop("disabled", keys.length < 1);
+		$("#btnExecuteAnswer--${pageName}").prop("disabled", keys.length < 1);
 		$("#btnAnswerComplete--${pageName}").prop("disabled", keys.length < 1);
+		$("#btnExecuteDisabledTagInfoInquire--${pageName}").prop("disabled", keys.length < 1);
 	};
 	
 	/**************************************************************************
@@ -298,6 +311,13 @@ $(document).ready(function(){
 	}
 
 	$P.fnResetAndChangeBiz = taskSeCd => {
+		var clsForTask = taskSeCd.toLowerCase();
+		//업무별 버튼
+		renderForTask("gridbuttonArea--${pageName}", clsForTask);
+		//버튼 이벤트 재매핑 
+		$("#btnExecuteDisabledTagInfoInquire--${pageName}").off("click");
+		$("#btnExecuteDisabledTagInfoInquire--${pageName}").on("click", () => $P.fnExecuteDisabledTagInfoInquire());
+		
 		$P.fnReset();
 		$P.crdnControl.urls.load = wctx.url("/"+taskSeCd+"/cvlc/cvlc02/030/list.do");
 		$P.crdnControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt02/010/main.do");
@@ -492,7 +512,7 @@ $(document).ready(function(){
 		});
 	}
 	
-	$P.fnAnswerExecute = () => {
+	$P.fnExecuteAnswer = () => {
 		
 		var count = $P.crdnControl.dataset.getKeys("selected").length;
 		
@@ -516,6 +536,47 @@ $(document).ready(function(){
 		});
 	}
 	
+	//표지정보 조회
+	$P.fnExecuteDisabledTagInfoInquire = () => {
+		
+		var keys = [];
+		
+		var selected = $P.crdnControl.dataset.getDataset("selected");
+		
+		for(var i=0; i < selected.length; i++){
+			if(selected[i].CVLCPT_PRCS_CD == "02"){
+				keys.push(selected[i].CRDN_ID);
+			}
+		}
+		
+		if(keys.length == 0){
+			dialog.alert("표지조회는 부과대상자료만 가능합니다.<br/>선택된 자료 중에 부과대상자료가 없습니다.");
+			return;
+		}
+		
+		var message = "※표지정보 조회 후 장애인차량이 아닌 자료는 서손처리 됩니다."
+			  +"<br/>※현재 날짜("+dateFormat.format(new Date())+")를 기준으로 차량번호로 조회합니다."
+			  +"<br/>표지조회를 실행하시겠습니까?"
+			  +"<br/>부과대상 자료 : "+keys.length+"건";
+		
+		dialog.alert({
+			content : message,
+			onOK : () => {
+				ajax.get({
+					url : wctx.url("/DPV/cvlc/cvlc02/040/update.do"),
+					data : { 
+						"crdnIDs" : keys.join(",")
+					},
+					success : resp => {
+						
+						dialog.alert("표지정보조회가 실행되었습니다.");
+						
+					}
+				});
+			}
+		});
+	}
+	
 	$P.provide = {
 		"getCountStatus" : function(currentKey){
 			var ds = $P.crdnControl.dataset.getDataset();
@@ -555,8 +616,9 @@ $(document).ready(function(){
     $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList());
     $("#btnOpenCvlcptOrgnl--${pageName}").on("click", () => $P.fnOpenCvlcptOrgnl());
     $("#btnOpenAnswerPreview--${pageName}").on("click", () => $P.fnOpenAnswerPreview());
-    $("#btnAnswerExecute--${pageName}").on("click", () => $P.fnAnswerExecute());
+    $("#btnExecuteAnswer--${pageName}").on("click", () => $P.fnExecuteAnswer());
 	$("#btnAnswerComplete--${pageName}").on("click", () => $P.fnAnswerComplete());
+
     $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
     
 	/**************************************************************************