From 584c2593f46e7104727cdddd1f9eb435250eb01b Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 26 Jan 2024 10:33:47 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8F=99=EC=9D=BC=EC=B0=A8=EB=9F=89=20?=
 =?UTF-8?q?=EB=8B=A8=EC=86=8D=EA=B1=B4=EC=88=98=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/crdn/dao/CrdnListMapper.java     |  6 +++
 .../xit/fims/crdn/service/CrdnService.java    | 10 ++++
 .../crdn/service/bean/CrdnServiceBean.java    | 27 ++++++-----
 .../xit/fims/crdn/web/Crdn06Controller.java   | 16 +++++++
 .../cokr/xit/fims/task/web/BpvController.java |  6 +++
 .../cokr/xit/fims/task/web/DpvController.java |  6 +++
 .../cokr/xit/fims/task/web/EcaController.java |  6 +++
 .../cokr/xit/fims/task/web/PvsController.java |  6 +++
 .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 10 ++++
 .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp  | 47 ++++++++++++++-----
 .../js/fims/framework/cmm/searchUtil.js       | 20 ++++++++
 11 files changed, 137 insertions(+), 23 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/dao/CrdnListMapper.java b/src/main/java/cokr/xit/fims/crdn/dao/CrdnListMapper.java
index 5801a4eb..bf320171 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/CrdnListMapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/CrdnListMapper.java
@@ -56,4 +56,10 @@ public interface CrdnListMapper extends AbstractMapper {
 	 */
 	List<DataObject> selectTagInformationUndefinedDataList(CrdnQuery query);
 
+	/**단속 건수를 반환한다.
+	 * @param crdnQuery 조회조건
+	 * @return 단속 건수
+	 */
+	int countCrdn(CrdnQuery crdnQuery);
+
 }
diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java
index 38ffba56..ff41dcc2 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java
@@ -79,6 +79,16 @@ public interface CrdnService {
 	 */
 	boolean removeEquipmentLinkFile(String workPath, String fileName);
 
+	/** 단속 사진에 대한 파일 처리를 실행한다.
+	 * @param crdn 단속정보, processList 파일 처리 목록
+	 * @return 처리 결과 메시지
+	 */
 	String changeCrdnImageFile(Crdn crdn, List<Map<String, Object>> processList);
 
+	/** 단속자료 건수를 조회한다.
+	 * @param crdnQuery 단속자료 조회조건
+	 * @return 단속자료 건수
+	 */
+	int countCrdn(CrdnQuery crdnQuery);
+
 }
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
index a4c29049..ac2df297 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java
@@ -36,22 +36,22 @@ import cokr.xit.foundation.data.DataObject;
 public class CrdnServiceBean extends AbstractServiceBean implements CrdnService {
 
 	@Resource(name="crdnCvlcptMapper")
-	protected CrdnCvlcptMapper crdnCvlcptMapper;
+	private CrdnCvlcptMapper crdnCvlcptMapper;
 
 	@Resource(name="crdnListMapper")
-	protected CrdnListMapper crdnListMapper;
+	private CrdnListMapper crdnListMapper;
 
 	@Resource(name="crdnInstMapper")
-	protected CrdnInstMapper crdnInstMapper;
+	private CrdnInstMapper crdnInstMapper;
 
 	@Resource(name="crdnUpdtMapper")
-	protected CrdnUpdtMapper crdnUpdtMapper;
+	private CrdnUpdtMapper crdnUpdtMapper;
 
 	@Resource(name="crdnInfoMapper")
 	private CrdnInfoMapper crdnInfoMapper;
 
 	@Resource(name="globalStngMapper")
-	protected GlobalStngMapper globalStngMapper;
+	private GlobalStngMapper globalStngMapper;
 
 	@Resource(name="totalInfoMapper")
 	private TotalInfoMapper totalInfoMapper;
@@ -69,22 +69,22 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 	private ImportMapper importMapper;
 
 	@Resource(name="crdnStngBean")
-	protected CrdnStngBean crdnStngBean;
+	private CrdnStngBean crdnStngBean;
 
 	@Resource(name="crdnCvlcptMainBean")
-	protected CrdnCvlcptMainBean crdnCvlcptMainBean;
+	private CrdnCvlcptMainBean crdnCvlcptMainBean;
 
 	@Resource(name="crdnBean")
-	protected CrdnBean crdnBean;
+	private CrdnBean crdnBean;
 
 	@Resource(name = "levyExclBean")
-	protected LevyExclBean levyExclBean;
+	private LevyExclBean levyExclBean;
 
 	@Resource(name="crdnSttsHstryBean")
-	protected CrdnSttsHstryBean crdnSttsHstryBean;
+	private CrdnSttsHstryBean crdnSttsHstryBean;
 
 	@Resource(name="crdnPayerHstryBean")
-	protected CrdnPayerHstryBean crdnPayerHstryBean;
+	private CrdnPayerHstryBean crdnPayerHstryBean;
 
 	@Override
 	public List<DataObject> getCrackdownList(CrdnQuery query) {
@@ -332,4 +332,9 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 		return rtnMsg;
 
 	}
+
+	@Override
+	public int countCrdn(CrdnQuery crdnQuery) {
+		return crdnListMapper.countCrdn(crdnQuery);
+	}
 }
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 69cecc55..a60f4ab0 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -40,6 +40,7 @@ public class Crdn06Controller extends ApplicationController {
 			  crackdownManagementMain = "/010/main.do"
 			, getCrackdownList = "/010/list.do"
 			, removeCrackdown = "/010/remove.do"
+			, countCrdn = "/010/countCrdn.do"
 			, getCrackdownInfo = "/020/info.do"
 			, updateCrackdown = "/020/update.do"
 			, getCrackdownStatusInfo = "/030/info.do"
@@ -158,6 +159,21 @@ public class Crdn06Controller extends ApplicationController {
 				.addObject("rtnMsg", rtnMsg);
 	}
 
+	/**지정한 조회조건으로 단속 건수를 반환한다.
+	 * @param CrdnQuery 조회조건
+	 * @return jsonView
+	 */
+	public ModelAndView countCrdn(CrdnQuery crdnQuery) {
+		ModelAndView mav = new ModelAndView("jsonView");
+
+		int crdnCount = crdnService.countCrdn(crdnQuery);
+
+		mav.addObject("crdnCount", crdnCount);
+
+		return mav;
+	}
+
+
 	/**지정한 ID의 단속 정보(info)를 반환한다.
 	 * @param query 단속 대장 조회 조건
 	 * @return fims/crdn/crdn06020-info 또는 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 d039e79a..8dcac925 100644
--- a/src/main/java/cokr/xit/fims/task/web/BpvController.java
+++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java
@@ -285,6 +285,12 @@ public class BpvController {
 			return super.removeCrackdown(crdn);
 		}
 
+		@Override
+		@RequestMapping(name="전용차로과태료업무 단속 건수 조회", value=METHOD_URL.countCrdn)
+		public ModelAndView countCrdn(CrdnQuery query) {
+			return super.countCrdn(query);
+		}
+
 		@Override
 		@RequestMapping(name="전용차로과태료업무 단속자료 조회", value=METHOD_URL.getCrackdownStatusInfo)
 		public ModelAndView getCrackdownStatusInfo(CrdnQuery query) {
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 cf386a8c..43d1ff1d 100644
--- a/src/main/java/cokr/xit/fims/task/web/DpvController.java
+++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java
@@ -325,6 +325,12 @@ public class DpvController {
 			return super.removeCrackdown(crdn);
 		}
 
+		@Override
+		@RequestMapping(name="장애인과태료업무 단속 건수 조회", value=METHOD_URL.countCrdn)
+		public ModelAndView countCrdn(CrdnQuery query) {
+			return super.countCrdn(query);
+		}
+
 		@Override
 		@RequestMapping(name="장애인과태료업무 단속자료 조회", value=METHOD_URL.getCrackdownStatusInfo)
 		public ModelAndView getCrackdownStatusInfo(CrdnQuery query) {
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 d956f260..61b8bf92 100644
--- a/src/main/java/cokr/xit/fims/task/web/EcaController.java
+++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java
@@ -284,6 +284,12 @@ public class EcaController {
 			return super.removeCrackdown(crdn);
 		}
 
+		@Override
+		@RequestMapping(name="전기차과태료업무 단속 건수 조회", value=METHOD_URL.countCrdn)
+		public ModelAndView countCrdn(CrdnQuery query) {
+			return super.countCrdn(query);
+		}
+
 		@Override
 		@RequestMapping(name="전기차과태료업무 단속자료 조회", value=METHOD_URL.getCrackdownStatusInfo)
 		public ModelAndView getCrackdownStatusInfo(CrdnQuery query) {
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 5d34155f..ec2ac685 100644
--- a/src/main/java/cokr/xit/fims/task/web/PvsController.java
+++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java
@@ -297,6 +297,12 @@ public class PvsController {
 			return super.removeCrackdown(crdn);
 		}
 
+		@Override
+		@RequestMapping(name="주정차과태료업무 단속 건수 조회", value=METHOD_URL.countCrdn)
+		public ModelAndView countCrdn(CrdnQuery query) {
+			return super.countCrdn(query);
+		}
+
 		@Override
 		@RequestMapping(name="주정차과태료업무 단속자료 조회", value=METHOD_URL.getCrackdownStatusInfo)
 		public ModelAndView getCrackdownStatusInfo(CrdnQuery query) {
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 cba9250b..dc74b8db 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
@@ -441,5 +441,15 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 <include refid="utility.paging-suffix"/>
 </select>
 
+<select id="countCrdn" parameterType="map" resultType="int">
+/* 단속 건수 조회(crdnListMapper.countCrdn) */
+    SELECT COUNT(*)
+      FROM TB_CRDN C
+LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID)
+     WHERE C.DEL_YN  = 'N'
+       AND C.CRDN_STTS_CD != '01'
+       AND C.TASK_SE_CD = #{taskSeCd}
+       AND C.VHRNO = #{vhrno}
+</select>
 
 </mapper>
\ No newline at end of file
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 4a5fb7a4..53cfd991 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
@@ -65,6 +65,14 @@
 					<input type="text" id="vhrno--${pageName}" name="vhrno" data-map="VHRNO" class="form-control"
 						data-maxlengthb="30" />
 				</div>
+				<div class="col-md-12">
+					<button type="button" id="btnViewCrdnList--${pageName}" class="btn btn-outline-dark float-end mx-2">
+					동일번호&nbsp;<span id="outputCrdnCount--${pageName}"></span>건
+					</button>
+					<button type="button" id="btnViewCvlcptDscsnList--${pageName}" class="btn btn-outline-dark float-end mx-2">
+					차량민원&nbsp;<span id="outputCvlcptDscsnCount--${pageName}"></span>건
+					</button>
+				</div>
 				<div class="col-md-6">
 					<label for="vltnCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">
 						위반내용
@@ -572,6 +580,9 @@ $(document).ready(function(){
 				crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN);
 				$P.crdnControl.setData([crdnInfo]);
 
+				$("#btnViewCrdnList--${pageName}").attr("hidden","hidden");
+				$("#btnViewCvlcptDscsnList--${pageName}").attr("hidden","hidden");
+				
 				//보안모드
 			    fn_securityModeToggle($("#securityMode--top").is(":checked"));
 
@@ -893,6 +904,14 @@ $(document).ready(function(){
 		
 		
 		var resp = null;
+
+		resp = await countCrdnByVhrno(vhrno, "${taskSeCd}");
+		if(resp.crdnCount > 0){
+			$("#outputCrdnCount--${pageName}").html(resp.crdnCount);
+			$("#btnViewCrdnList--${pageName}").removeAttr("hidden");
+		} else {
+			$("#btnViewCrdnList--${pageName}").attr("hidden","hidden");
+		}
 		
 		resp = await getVhclInfo($("#sggCd--${pageName}").val(), vhrno, crdnYmd);
 		
@@ -976,6 +995,17 @@ $(document).ready(function(){
 		
 	});
 
+	//단속내역 보기
+	$("#btnViewCrdnList--${pageName}").on("click", function(){
+		
+	});
+	
+	//민원내역 보기
+	$("#btnViewCvlcptDscsnList--${pageName}").on("click", function(){
+		
+	});
+	
+	
 	if("${taskSeCd}" == "DPV"){
 		$("#vltnCd--${pageName}").on("change", function(){
 			if(this.value == "01"){
@@ -1007,18 +1037,6 @@ $(document).ready(function(){
 	 **************************************************************************/
 	initDatepicker("frmEdit--${pageName}"); //달력 초기화
 
-	$("#frmEdit--${pageName}").find(".form-date").each(function(){
-		$(this).on("input",function(){
-			var value = this.value.replaceAll("-","");
-
-			if(value.length > 7){
-				this.value = value.substring(0,4)+"-"+value.substring(4,6)+"-"+value.substring(6);
-			} else if(value.length > 5){
-				this.value = value.substring(0,4)+"-"+value.substring(4);
-			}
-
-		});
-	});
 	$("#frmEdit--${pageName}").find(".form-time").each(function(){
 		$(this).on("input",function(){
 			var value = this.value.replaceAll(":","");
@@ -1032,6 +1050,9 @@ $(document).ready(function(){
 		});
 	});
 
+	$("#btnViewCrdnList--${pageName}").attr("hidden","hidden");
+	$("#btnViewCvlcptDscsnList--${pageName}").attr("hidden","hidden");
+	
 	var crdnInfo = ${crdnInfo};
 	crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN);
 	$P.crdnControl.setData([crdnInfo]);
@@ -1137,6 +1158,8 @@ $(document).ready(function(){
 		}
 	);
 	
+	
+	
 	//사진영역 초기화
 	var existVideo = false;
 	if(crdnInfo.VIDEO_EXIST_YN == "Y"){
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 1b4b087b..5cc58e42 100644
--- a/src/main/webapp/resources/js/fims/framework/cmm/searchUtil.js
+++ b/src/main/webapp/resources/js/fims/framework/cmm/searchUtil.js
@@ -16,6 +16,26 @@ function searchFromGridTitle(byValue, byOutputValue, mainOption, subOption){
 	document.getElementById(subOptionElementId).value = subOption;
 }
 
+/**************************************************************************
+* 차량번호로 단속 건수 조회
+**************************************************************************/
+async function countCrdnByVhrno(vhrno, taskSeCd){
+    return new Promise((resolve, reject) => {
+        json.get({
+            url: wctx.url("/"+taskSeCd+"/crdn/crdn06/010/countCrdn.do"),
+            data: {
+                vhrno : vhrno,
+                taskSeCd : taskSeCd
+            },
+            success: function(resp, textStatus, jqXHR) {
+                resolve(resp);
+            },
+            error: function(jqXHR, textStatus, error) {
+            }
+        });
+    });
+}
+
 /**************************************************************************
 * 시군구코드, 차량번호, 기준일자로 차적 조회
 **************************************************************************/