Compare commits

..

No commits in common. "3ddc61b5f3d76b9e3f3339258fc0a25e30f1c37e" and "47d4bbf220c623f6e1da96f79d1c158319211f73" have entirely different histories.

2 changed files with 10 additions and 20 deletions

View File

@ -10,7 +10,16 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import com.interplug.qcast.biz.canvaspopupstatus.CanvasPopupStatusService;
@ -1656,14 +1665,6 @@ public class EstimateService {
String templateFilePath = "pdf_download_quotation_detail_template.html";
String userId = estimateRequest.getUserId();
String storeLvl = estimateRequest.getStoreLvl();
String saleStoreId = estimateRequest.getSaleStoreId();
if(storeLvl != null && storeLvl.equals("2")){
if(!Objects.equals(Objects.requireNonNull(saleStoreId), userId))
templateFilePath = "pdf_download_quotation_detail_template2.html";
}
// 템플릿 html 조회
Document doc = PdfUtil.getPdfDoc(request, templateFilePath);
@ -1709,14 +1710,6 @@ public class EstimateService {
Workbook workbook = null;
String excelTemplateNam = "excel_download_quotation_detail_template.xlsx";
String userId = estimateRequest.getUserId();
String storeLvl = estimateRequest.getStoreLvl();
String saleStoreId = estimateRequest.getSaleStoreId();
if(storeLvl != null && storeLvl.equals("2")){
if(!Objects.equals(Objects.requireNonNull(saleStoreId), userId))
excelTemplateNam = "excel_download_quotation_detail_template2.xlsx";
}
// itemGroup이 "STAND_" 아닌 항목들만 필터링하여 새로운 리스트 생성
List<ItemResponse> estimateItemList15 = estimateItemList.stream()

View File

@ -216,7 +216,4 @@ public class EstimateRequest {
@Schema(description = "2차 SAP 판매점코드")
private String secSapSalesStoreCd;
@Schema(description = "판매점레벨")
private String storeLvl;
}