qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: #319
This commit is contained in:
qcast3 2026-01-14 13:15:02 +09:00
commit b5f5f40709
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -1667,8 +1667,8 @@ public class EstimateService {
String userId = estimateRequest.getUserId(); String userId = estimateRequest.getUserId();
String storeLvl = estimateRequest.getStoreLvl(); String storeLvl = estimateRequest.getStoreLvl();
String createStoreId = estimateRequest.getCreateStoreId(); String createStoreId = estimateRequest.getCreateStoreId();
if(storeLvl != null && storeLvl.equals("2")){ if(storeLvl != null && !storeLvl.equals("1")){
if(!Objects.equals(createStoreId, userId)) if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId))
templateFilePath = "pdf_download_quotation_detail_template2.html"; templateFilePath = "pdf_download_quotation_detail_template2.html";
} }
@ -1721,8 +1721,8 @@ public class EstimateService {
String userId = estimateRequest.getUserId(); String userId = estimateRequest.getUserId();
String storeLvl = estimateRequest.getStoreLvl(); String storeLvl = estimateRequest.getStoreLvl();
String createStoreId = estimateRequest.getCreateStoreId(); String createStoreId = estimateRequest.getCreateStoreId();
if(storeLvl != null && storeLvl.equals("2")){ if(storeLvl != null && !storeLvl.equals("1")){
if(!Objects.equals(createStoreId, userId)) if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId))
excelTemplateNam = "excel_download_quotation_detail_template2.xlsx"; excelTemplateNam = "excel_download_quotation_detail_template2.xlsx";
} }

3
src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java
View File

@ -307,5 +307,8 @@ public class EstimateResponse {
@Schema(description = "영업점 Fax번호") @Schema(description = "영업점 Fax번호")
private String salesOfficeFax; private String salesOfficeFax;
@Schema(description = "작성자 판매점 ID")
private String createSaleStoreId;
} }