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 937dd532..457d6167 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -3181,6 +3181,10 @@ public class EstimateService { SimulationEstimateListResponse response = new SimulationEstimateListResponse(); + if (!"T01".equals(objectRequest.getSaleStoreId())) { + objectRequest.setSchSelSaleStoreId(""); + } + // 견적서 목록 조회 List objectList = estimateMapper.selectSimulationEstimateList(objectRequest); diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownController.java b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownController.java index 9b668140..461b1f3f 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownController.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownController.java @@ -34,14 +34,22 @@ public class ExcelDownController { @ResponseStatus(HttpStatus.OK) public QuotResponse quotExclDownData(@RequestBody QuotRequest quotRequest) throws Exception { - List quotPlanExclDownData = - excelDownService.selectQuotPlanExclDownData(quotRequest); - List quotItemExclDownData = - excelDownService.selectQuotItemExclDownData(quotRequest); - QuotResponse quotRes = new QuotResponse(); - quotRes.setQuotPlanList(quotPlanExclDownData); - quotRes.setQuotItemList(quotItemExclDownData); + + if ("1".equals(quotRequest.getSch_selectType())) { + List quotPlanExclDownData = + excelDownService.selectQuotPlanExclDownData(quotRequest); + List quotItemExclDownData = + excelDownService.selectQuotItemExclDownData(quotRequest); + + quotRes.setQuotPlanList(quotPlanExclDownData); + quotRes.setQuotItemList(quotItemExclDownData); + } else { + List quotPlanExclDownData = + excelDownService.selectQuotPlanExclDownData2(quotRequest); + + quotRes.setQuotPlanList(quotPlanExclDownData); + } return quotRes; } diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownMapper.java b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownMapper.java index a9c8ceb1..72a13a5b 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownMapper.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownMapper.java @@ -23,6 +23,15 @@ interface ExcelDownMapper { */ List selectQuotPlanExclDownData(QuotRequest quotRequest) throws Exception; + /** + * 과거데이터_견적 엑셀다운로드 조회 - 심플모드 + * + * @param quotRequest + * @return + * @throws Exception + */ + List selectQuotPlanExclDownData2(QuotRequest quotRequest) throws Exception; + /** * 과거데이터_견적 엑셀다운로드 조회(아이템) * diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownService.java b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownService.java index d31a7eb7..eb8219e6 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownService.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/ExcelDownService.java @@ -38,6 +38,18 @@ public class ExcelDownService { return excelDownMapper.selectQuotPlanExclDownData(quotRequest); } + /** + * 과거데이터_견적 엑셀다운로드 조회 + * + * @param quotRequest + * @return + * @throws Exception + */ + public List selectQuotPlanExclDownData2(QuotRequest quotRequest) + throws Exception { + return excelDownMapper.selectQuotPlanExclDownData2(quotRequest); + } + /** * 과거데이터_견적 엑셀다운로드 조회(아이템) * diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotPlanResponse.java b/src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotPlanResponse.java index e1e3f7fb..d409845c 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotPlanResponse.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotPlanResponse.java @@ -117,5 +117,8 @@ public class QuotPlanResponse { private String saleOther; @Schema(description = "가대판매가격 架台販売価格") private String saleStand; - + @Schema(description = "플랜정보 등록일시 プラン情報登録日時") + private String createDatetime; + @Schema(description = "플랜정보 등록자 プラン情報登録者") + private String createUser; } \ No newline at end of file diff --git a/src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotRequest.java b/src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotRequest.java index c26fd90b..ea418012 100644 --- a/src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotRequest.java +++ b/src/main/java/com/interplug/qcast/biz/excelDown/dto/QuotRequest.java @@ -11,6 +11,8 @@ import lombok.Setter; public class QuotRequest { @Schema(description = "Language Code") private String langCd; + @Schema(description = "조회타입") + private String sch_selectType; @Schema(description = "시작일") private String sch_startDt; @Schema(description = "종료일") diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 2f97bdcc..f59e13f8 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -1612,9 +1612,6 @@ AND O.OBJECT_NO LIKE '%' + #{schObjectNo} + '%' - - AND O.SALE_STORE_ID = #{schSaleStoreId} - /* 2차점까지 고름 */ AND O.SALE_STORE_ID = #{schOtherSelSaleStoreId} diff --git a/src/main/resources/mappers/excelDown/excelDownMapper.xml b/src/main/resources/mappers/excelDown/excelDownMapper.xml index 5dd2dfdd..76b832cf 100644 --- a/src/main/resources/mappers/excelDown/excelDownMapper.xml +++ b/src/main/resources/mappers/excelDown/excelDownMapper.xml @@ -192,6 +192,42 @@ + +