diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index aa57e894..50da5e35 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1670,9 +1670,10 @@ public class EstimateService { String createStoreId = estimateRequest.getCreateStoreId(); String hiddenYn = "N"; if(storeLvl != null && !storeLvl.equals("1")){ - if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId)) - hiddenYn = 'Y'; + if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId)) { + hiddenYn = "Y"; //templateFilePath = "pdf_download_quotation_detail_template2.html"; + } } @@ -2143,14 +2144,14 @@ public class EstimateService { + ""); sb.append( "" - + !"Y".equals(hiddenYn) ? StringUtils.defaultString(itemResponse.getSalePrice()) : "" + + ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(itemResponse.getSalePrice()) : "") + ""); sb.append("" + StringUtils.defaultString(itemResponse.getAmount()) + ""); sb.append( "" + StringUtils.defaultString(itemResponse.getUnit()) + ""); sb.append("" - + !"Y".equals(hiddenYn) ? StringUtils.defaultString(itemResponse.getSaleTotPrice()) : "" + ""); + + ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(itemResponse.getSaleTotPrice()) : "") + ""); sb.append(""); } if ("Y".equals(data.getPkgYn())) { @@ -2164,7 +2165,7 @@ public class EstimateService { + StringUtils.defaultString(data.getTotVol()) + ""); sb.append("W"); sb.append("" - + !"Y".equals(hiddenYn) ? StringUtils.defaultString(data.getPkgTotPrice()) : "" + ""); + + ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(data.getPkgTotPrice()) : "") + ""); sb.append(""); } elm = doc.getElementById("itemList_detail");