From 9aa7d949477efac490689e3c899ea01c78160bd2 Mon Sep 17 00:00:00 2001 From: "LAPTOP-L3VE7KK2\\USER" Date: Fri, 15 Nov 2024 09:42:09 +0900 Subject: [PATCH] =?UTF-8?q?QSP=20=EA=B2=AC=EC=A0=81=EC=84=9C=20BOM=20?= =?UTF-8?q?=EC=A0=84=EC=86=A1=20=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/interplug/qcast/biz/estimate/EstimateService.java | 1 + .../com/interplug/qcast/biz/estimate/dto/EstimateRequest.java | 3 +++ src/main/resources/mappers/estimate/estimateMapper.xml | 3 +++ 3 files changed, 7 insertions(+) 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 283eb57d..3da990ee 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1026,6 +1026,7 @@ public class EstimateService { estimateSendResponse.setDelFlg("1".equals(estimateSendResponse.getDelFlg()) ? "Y" : "N"); // 아이템 목록 조회 + estimateRequest.setSchBomNotExist("1"); List estimateItemList = estimateMapper.selectEstimateItemList(estimateRequest); estimateSendResponse.setItemList(estimateItemList); diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java index 9e72ef4d..86756844 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java @@ -181,6 +181,9 @@ public class EstimateRequest { @Schema(description = "검색 - 아이템 그룹") private String schItemGroup; + @Schema(description = "검색 - 아이템 BOM 제외여부") + private String schBomNotExist; + // 데이터 목록 관련 정보 @Schema(description = "지붕재 목록") List roofList; diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index e30bdce8..0385d581 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -191,6 +191,9 @@ ON PE.ITEM_ID = I.ITEM_ID WHERE PE.OBJECT_NO = #{objectNo} AND PE.PLAN_NO = #{planNo} + + AND (PE.PA_DISP_ORDER IS NULL OR PE.PA_DISP_ORDER = '') + ORDER BY PE.DISP_ORDER ASC