통계 수정

src/main/java/cokr/xit/fims/stat/service/bean/StatBean.java

@@ -217,8 +217,8 @@ public class StatBean extends AbstractComponent {
 
 											String ffnlgCarmdlCd = item.string("FFNLG_CARMDL_CD");
 											String vhrno = item.string("VHRNO");
-
 											result += crdnStngBean.getBusinessYnOfCar(ffnlgCarmdlCd, vhrno);
+
 										} else {
 											result += colValue;
 										}
@@ -402,9 +402,12 @@ public class StatBean extends AbstractComponent {
 				String itemName = "";
 
 				if(ctgrType.equals("code")){ //공통코드
-
-					itemName = codeConverter.codeToValue(dtlCtgr, compositeItemId[i]);
-
+					String converted = codeConverter.codeToValue(dtlCtgr, compositeItemId[i]);
+					if(ifEmpty(converted, ()->"").equals("")) {
+						itemName = compositeItemId[i];
+					} else {
+						itemName = converted;
+					}
 				} else if(ctgrType.equals("otherCode")) { //비공통코드
 
 					if(dtlCtgr.equals("VLTN_CD")) {
@@ -420,8 +423,12 @@ public class StatBean extends AbstractComponent {
 							throw new RuntimeException("위반코드 변환 오류");
 						}
 
-						itemName = codeConverter.vltnCdToValue(taskSeCd, compositeItemId[i]);
-
+						String converted = codeConverter.vltnCdToValue(taskSeCd, compositeItemId[i]);
+						if(ifEmpty(converted, ()->"").equals("")) {
+							itemName = compositeItemId[i];
+						} else {
+							itemName = converted;
+						}
 					} else if(dtlCtgr.equals("VLTN_ID") || dtlCtgr.equals("TEAM_ID")
 							|| dtlCtgr.equals("SGG_CD") || dtlCtgr.equals("DEPT_CD") || dtlCtgr.equals("USER_ID")) {
 
@@ -434,6 +441,8 @@ public class StatBean extends AbstractComponent {
 							if(findRow != null){
 								itemName = findRow.string("NAME");
 								codeConverter.putOtherCode(dtlCtgr, findRow);
+							} else {
+								itemName = compositeItemId[i];
 							}
 						}
 					}