feature/jp-0331 #526

Open
jungpyo2001 wants to merge 998 commits from feature/jp-0331 into main
3 changed files with 7 additions and 0 deletions
Showing only changes of commit 9aa7d94947 - Show all commits

View File

@ -1026,6 +1026,7 @@ public class EstimateService {
estimateSendResponse.setDelFlg("1".equals(estimateSendResponse.getDelFlg()) ? "Y" : "N");
// 아이템 목록 조회
estimateRequest.setSchBomNotExist("1");
List<ItemResponse> estimateItemList = estimateMapper.selectEstimateItemList(estimateRequest);
estimateSendResponse.setItemList(estimateItemList);

View File

@ -181,6 +181,9 @@ public class EstimateRequest {
@Schema(description = "검색 - 아이템 그룹")
private String schItemGroup;
@Schema(description = "검색 - 아이템 BOM 제외여부")
private String schBomNotExist;
// 데이터 목록 관련 정보
@Schema(description = "지붕재 목록")
List<RoofRequest> roofList;

View File

@ -191,6 +191,9 @@
ON PE.ITEM_ID = I.ITEM_ID
WHERE PE.OBJECT_NO = #{objectNo}
AND PE.PLAN_NO = #{planNo}
<if test='schBomNotExist != null and schBomNotExist == "1"'>
AND (PE.PA_DISP_ORDER IS NULL OR PE.PA_DISP_ORDER = '')
</if>
ORDER BY
PE.DISP_ORDER ASC
</select>