From 09d42166f889eb5020424fb3dd2cf2cf05155a4f Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 10 Nov 2023 16:34:41 +0900
Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cokr/xit/fims/stat/StatQuery.java     | 13 +++++++++++++
 .../xit/fims/stat/service/bean/StatServiceBean.java |  7 +++++++
 .../webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/src/main/java/cokr/xit/fims/stat/StatQuery.java b/src/main/java/cokr/xit/fims/stat/StatQuery.java
index 8c6dffb7..f09df09f 100644
--- a/src/main/java/cokr/xit/fims/stat/StatQuery.java
+++ b/src/main/java/cokr/xit/fims/stat/StatQuery.java
@@ -93,6 +93,10 @@ public class StatQuery extends CmmnQuery {
 	 */
 	private int dayRange;
 
+	/**
+	 * 차량구분
+	 */
+	private String carGb;
 
 	public String getStructureType() {
 		return ifEmpty(structureType, () -> null);
@@ -230,4 +234,13 @@ public class StatQuery extends CmmnQuery {
 		return self();
 	}
 
+	public String getCarGb() {
+		return ifEmpty(carGb, () -> null);
+	}
+
+	public <T extends StatQuery> T setCarGb(String carGb) {
+		this.carGb = carGb;
+		return self();
+	}
+
 }
diff --git a/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java b/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java
index 74118721..a3cda2b1 100644
--- a/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java
+++ b/src/main/java/cokr/xit/fims/stat/service/bean/StatServiceBean.java
@@ -16,6 +16,7 @@ import cokr.xit.fims.cmmn.CrdnSttsHstryQuery;
 import cokr.xit.fims.cmmn.service.CrdnSttsHstryService;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.service.CrdnService;
+import cokr.xit.fims.crdn.service.bean.CrdnStngBean;
 import cokr.xit.fims.excl.LevyExclQuery;
 import cokr.xit.fims.excl.service.OpnnSbmsnService;
 import cokr.xit.fims.sndb.SndbQuery;
@@ -45,6 +46,8 @@ public class StatServiceBean extends AbstractServiceBean implements StatService
 	@Resource(name = "statBean")
 	private StatBean statBean;
 
+	@Resource(name = "crdnStngBean")
+	private CrdnStngBean crdnStngBean;
 
 	@Override
 	public Stat getStatistics(StatQuery statQuery, Map<String, List<CommonCode>> commonCodes) {
@@ -198,6 +201,10 @@ public class StatServiceBean extends AbstractServiceBean implements StatService
 
 			}
 
+			if(!ifEmpty(statQuery.getCarGb(), ()->"").equals("")) {
+	        	queryResult.removeIf(item -> !(crdnStngBean.getCarGb(item.string("VHRNO")).equals(statQuery.getCarGb())));
+			}
+
 			//통계 생성
 			stat = statBean.groupByCartegory(queryResult, statQuery);
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp
index c5a834ca..41bb67ab 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat01010-main.jsp
@@ -378,6 +378,8 @@ $(document).ready(function(){
 		statQuery.firstDay = formFieldsData.firstDay;
 		statQuery.lastDay = formFieldsData.lastDay;
 		
+		statQuery.carGb = formFieldsData.carGb;
+		
 		//통계 유형
 		var preset = $("#preset--${pageName}").find(":selected");
 		if(preset.val() == "totCnt"){