Merge pull request 'dev' (#324) from dev into dev-deploy

Reviewed-on: #324

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))
+          if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId)) {
-        	hiddenYn = 'Y';
+        	hiddenYn = "Y";
             //templateFilePath = "pdf_download_quotation_detail_template2.html";
+          }
         }
        
 
@@ -2143,14 +2144,14 @@ public class EstimateService {
               + "</td>");
       sb.append(
           "<td class='hide-column' style='width:80px;text-align:right;'>"
-              + !"Y".equals(hiddenYn) ? StringUtils.defaultString(itemResponse.getSalePrice()) : ""
+              + ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(itemResponse.getSalePrice()) : "")
               + "</td>");
       sb.append("<td style='width:60px;text-align:right;'>"
               + StringUtils.defaultString(itemResponse.getAmount()) + "</td>");
       sb.append(
               "<td style='width:60px;'>" + StringUtils.defaultString(itemResponse.getUnit()) + "</td>");
       sb.append("<td class='hide-column' style='width:80px;text-align:right;'>"
-              + !"Y".equals(hiddenYn) ? StringUtils.defaultString(itemResponse.getSaleTotPrice()) : "" + "</td>");
+              + ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(itemResponse.getSaleTotPrice()) : "") + "</td>");
       sb.append("</tr>");
     }
     if ("Y".equals(data.getPkgYn())) {
@@ -2164,7 +2165,7 @@ public class EstimateService {
               + StringUtils.defaultString(data.getTotVol()) + "</td>");
       sb.append("<td style='width:60px;'>W</td>");
       sb.append("<td style='width:80px;text-align:right;'>"
-              + !"Y".equals(hiddenYn) ? StringUtils.defaultString(data.getPkgTotPrice()) : "" + "</td>");
+              + ((!"Y".equals(hiddenYn)) ? StringUtils.defaultString(data.getPkgTotPrice()) : "") + "</td>");
       sb.append("</tr>");
     }
     elm = doc.getElementById("itemList_detail");