From 7247edd59efc45d169176ac94355ed3c8202ee31 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6ARNG1Q\\dlsgk" Date: Fri, 10 Jan 2025 14:00:19 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../displayItem/DisplayItemController.java | 30 +++++++++---------- .../biz/displayItem/DisplayItemMapper.java | 2 +- .../biz/displayItem/DisplayItemService.java | 17 ++++------- .../biz/displayItem/dto/ItemRequest.java | 17 +++++++++++ .../mappers/displayItem/displayItemMapper.xml | 22 ++++++++++---- 5 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 src/main/java/com/interplug/qcast/biz/displayItem/dto/ItemRequest.java diff --git a/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemController.java b/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemController.java index f0b246b6..d4c46425 100644 --- a/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemController.java +++ b/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemController.java @@ -1,6 +1,14 @@ package com.interplug.qcast.biz.displayItem; +import com.interplug.qcast.biz.displayItem.dto.DisplayItemRequest; +import com.interplug.qcast.biz.displayItem.dto.ItemDetailResponse; +import com.interplug.qcast.biz.displayItem.dto.ItemRequest; +import com.interplug.qcast.biz.displayItem.dto.ItemResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import java.util.List; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -9,13 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import com.interplug.qcast.biz.displayItem.dto.DisplayItemRequest; -import com.interplug.qcast.biz.displayItem.dto.ItemDetailResponse; -import com.interplug.qcast.biz.displayItem.dto.ItemResponse; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; @Slf4j @RestController @@ -27,7 +28,7 @@ public class DisplayItemController { /** * 전시제품 정보 등록/수정 - * + * * @param displayItemRequest * @throws Exception */ @@ -41,22 +42,21 @@ public class DisplayItemController { /** * 제품 목록 조회 - * - * @param saleStoreId + * + * @param itemRequest * @return * @throws Exception */ @Operation(description = "제품 목록을 조회한다.") - @GetMapping("/item-list") + @PostMapping("/item-list") @ResponseStatus(HttpStatus.OK) - public List getItemList(@RequestParam String saleStoreId) - throws Exception { - return displayItemService.getItemList(saleStoreId); + public List getItemList(@RequestBody ItemRequest itemRequest) throws Exception { + return displayItemService.getItemList(itemRequest); } /** * 제품 상세 정보 조회 - * + * * @param itemId * @return * @throws Exception diff --git a/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemMapper.java b/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemMapper.java index 9a83680c..651fd788 100644 --- a/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemMapper.java +++ b/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemMapper.java @@ -10,7 +10,7 @@ public interface DisplayItemMapper { void setStoreDisplayItemSave(DisplayItemRequest displayItemRequest) throws Exception; - List getItemList(@Param("saleStoreId") String saleStoreId); + List getItemList(ItemRequest itemRequest); ItemDetailResponse getItemDetail(@Param("itemId") String itemId); diff --git a/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemService.java b/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemService.java index 2e6dd1ef..956c14ed 100644 --- a/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemService.java +++ b/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemService.java @@ -1,19 +1,14 @@ package com.interplug.qcast.biz.displayItem; -import java.util.List; -import org.springframework.stereotype.Service; -import com.interplug.qcast.biz.displayItem.dto.BomSyncResponse; -import com.interplug.qcast.biz.displayItem.dto.DisplayItemRequest; -import com.interplug.qcast.biz.displayItem.dto.ItemDetailResponse; -import com.interplug.qcast.biz.displayItem.dto.ItemResponse; -import com.interplug.qcast.biz.displayItem.dto.ItemSyncResponse; -import com.interplug.qcast.biz.displayItem.dto.PriceItemSyncResponse; +import com.interplug.qcast.biz.displayItem.dto.*; import com.interplug.qcast.biz.estimate.EstimateMapper; import com.interplug.qcast.biz.estimate.dto.NoteRequest; import com.interplug.qcast.biz.estimate.dto.NoteResponse; import io.micrometer.common.util.StringUtils; +import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; @Slf4j @Service @@ -37,11 +32,11 @@ public class DisplayItemService { /** * 아이템 목록 조회 * - * @param saleStoreId + * @param itemRequest * @return */ - public List getItemList(String saleStoreId) { - return displayItemMapper.getItemList(saleStoreId); + public List getItemList(ItemRequest itemRequest) { + return displayItemMapper.getItemList(itemRequest); } /** diff --git a/src/main/java/com/interplug/qcast/biz/displayItem/dto/ItemRequest.java b/src/main/java/com/interplug/qcast/biz/displayItem/dto/ItemRequest.java new file mode 100644 index 00000000..0915f14b --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/displayItem/dto/ItemRequest.java @@ -0,0 +1,17 @@ +package com.interplug.qcast.biz.displayItem.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class ItemRequest { + + @Schema(description = "Sale Store Id") + private String saleStoreId; + + @Schema(description = "Cold Zone Flg") + private String coldZoneFlg; + + @Schema(description = "Salt-affected Flg") + private String saltAffectedFlg; +} diff --git a/src/main/resources/mappers/displayItem/displayItemMapper.xml b/src/main/resources/mappers/displayItem/displayItemMapper.xml index 04a777c5..d453a910 100644 --- a/src/main/resources/mappers/displayItem/displayItemMapper.xml +++ b/src/main/resources/mappers/displayItem/displayItemMapper.xml @@ -44,11 +44,11 @@ ); - /* sqlid : com.interplug.qcast.displayItem.getItemList */ SELECT TT.* FROM ( - SELECT /* 전체 목록중 미표시 제품 */ + SELECT /* 전체 목록중 미표시 제품 제외 */ MI.ITEM_ID , MI.ITEM_NO , MI.ITEM_NAME @@ -59,13 +59,19 @@ AND SSDI.SALE_STORE_ID = #{saleStoreId} AND SSDI.DISP_TYPE_CD = 'DISP002' /* 미표시 */ AND dbo.fn_fmtdDate(GETDATE(), 'YYYYMMDD') BETWEEN SSDI.START_DATE AND SSDI.END_DATE - WHERE MI.LIMITED_RELEASE_FLG = 0 + WHERE SSDI.ITEM_ID IS NULL AND MI.DEL_FLG = 0 - AND SSDI.ITEM_ID IS NULL + AND MI.LIMITED_RELEASE_FLG = 0 + + AND MI.COLD_ZONE_FLG = #{coldZoneFlg} + + + AND MI.SALT_AFFECTED_FLG = #{saltAffectedFlg} + UNION ALL - SELECT /* 미표시 제품 중 판매점만 표시 */ + SELECT /* 미표시 제품 중 등록된 표시 제품 표시 */ MI.ITEM_ID , MI.ITEM_NO , MI.ITEM_NAME @@ -75,6 +81,12 @@ ON MI.ITEM_ID = SSDI.ITEM_ID AND MI.LIMITED_RELEASE_FLG = 1 AND MI.DEL_FLG = 0 + + AND MI.COLD_ZONE_FLG = #{coldZoneFlg} + + + AND MI.SALT_AFFECTED_FLG = #{saltAffectedFlg} + WHERE SSDI.SALE_STORE_ID = #{saleStoreId} AND SSDI.DISP_TYPE_CD = 'DISP001' /* 표시 */ AND dbo.fn_fmtdDate(GETDATE(), 'YYYYMMDD') BETWEEN SSDI.START_DATE AND SSDI.END_DATE