매장 단가 조회 쿼리 수정

src/main/java/com/oqpo/api/mapper/stinfo/StoreItemUnitMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface StoreItemUnitMapper {
 
     List<StoreItemUnitEntity> selectStoreItemUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId , GridRequest gridRequest)throws Exception;
-    int selectStoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId )throws Exception;
+    int selectStoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreNm") String sStoreNm )throws Exception;
 /*
     List<StoreItemUnitEntity> selectSstoreItemUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId , GridRequest gridRequest)throws Exception;
     int selectSstoreItemUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId )throws Exception;

src/main/java/com/oqpo/api/service/stinfo/ItemUnitService.java

@@ -201,13 +201,13 @@ public class ItemUnitService extends CommonService {
     /*
       브랜드 매장 단가 리스트 조회
      */
-    public GridResponse selectStoreItemUnitGridList(String sBrandId, String sStoreId,  GridRequest gridRequest) throws Exception {
+    public GridResponse selectStoreItemUnitGridList(String sBrandId, String sStoreNm,  GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
-        int gridRecords = storeItemUnitMapper.selectStoreItemUnitGridCnt( sBrandId, sStoreId );
+        int gridRecords = storeItemUnitMapper.selectStoreItemUnitGridCnt( sBrandId, sStoreNm );
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitGridList(sBrandId, sStoreId, gridRequest);
+        List<StoreItemUnitEntity> entities = storeItemUnitMapper.selectStoreItemUnitGridList(sBrandId, sStoreNm, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> StoreItemUnitSearchResponse.builder()
                         .viewCd("R")

src/main/java/com/oqpo/api/web/controller/stinfo/ItemUnitController.java

@@ -124,11 +124,11 @@ public class ItemUnitController {
     public ResponseEntity<GridResponse> storeDetailGridList(@ApiIgnore String authTpCd, @RequestBody @Valid StoreItemUnitSearchGridRequest storeItemUnitSearchGridRequest) throws Exception {
 
         //System.out.println("============================>" +authTpCd );
-        if ("50".equals(authTpCd)  && "".equals(storeItemUnitSearchGridRequest.getSStoreId())) {
-            throw new GlobalException(SystemMessageCode.ERR_NONSTOREID);
-        }
+        //if ("50".equals(authTpCd)  && "".equals(storeItemUnitSearchGridRequest.getSStoreNm())) {
+        //    throw new GlobalException(SystemMessageCode.ERR_NONSTOREID);
+        //}
 
-        return ResponseEntity.ok(itemUnitService.selectStoreItemUnitGridList(storeItemUnitSearchGridRequest.getSBrandId(),storeItemUnitSearchGridRequest.getSStoreId(),  storeItemUnitSearchGridRequest.toDTO(storeItemUnitSearchGridRequest)));
+        return ResponseEntity.ok(itemUnitService.selectStoreItemUnitGridList(storeItemUnitSearchGridRequest.getSBrandId(),storeItemUnitSearchGridRequest.getSStoreNm(),  storeItemUnitSearchGridRequest.toDTO(storeItemUnitSearchGridRequest)));
     }
 
     /**

src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/StoreItemUnitSearchGridRequest.java

@@ -17,7 +17,7 @@ public class StoreItemUnitSearchGridRequest extends GridRequest {
     private String sBrandId;
 
     @ApiModelProperty(value = "매장아이디")
-    private String sStoreId;
+    private String sStoreNm;
 
     protected StoreItemUnitSearchGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
         super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);

src/main/resources/mybatis/sqlmaps/stinfo/StoreItemUnit.xml

@@ -12,8 +12,8 @@
         select  brand_id, store_id, cont_stt_dt, cont_end_dt, min(sys_reg_dttm) as sys_reg_dttm, count(*) as item_cnt
         from    store_item_unit_info
         where   brand_id = #{sBrandId}
-        <if test="sStoreId != null and sStoreId != ''">
-            and     store_id = #{sStoreId}
+        <if test="sStoreNm != null and sStoreNm != ''">
+            and     store_nm like concat('%', #{sStoreNm}, '%')
         </if>
         and     unit_target_cd = 'Y'
         group by brand_id, store_id, cont_stt_dt, cont_end_dt
@@ -45,8 +45,8 @@
         select  distinct brand_id, store_id, cont_stt_dt, cont_end_dt
         from    store_item_unit_info
         where   brand_id = #{sBrandId}
-        <if test="sStoreId != null and sStoreId != ''">
-            and     store_id = #{sStoreId}
+        <if test="sStoreNm != null and sStoreNm != ''">
+            and     store_nm like concat('%', #{sStoreNm}, '%')
         </if>
         and     unit_target_cd = 'Y'
         ) iunit