From b4b6f8ce3fd8ae9e29081da3040447862b593806 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 10 Nov 2023 12:13:11 +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 --- .../xit/fims/stat/service/bean/StatBean.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/cokr/xit/fims/stat/service/bean/StatBean.java b/src/main/java/cokr/xit/fims/stat/service/bean/StatBean.java index 21f15b6f..57f381cd 100644 --- a/src/main/java/cokr/xit/fims/stat/service/bean/StatBean.java +++ b/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]; } } }