위시리스트 수정

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

@@ -60,7 +60,13 @@ public interface ItemUnitMapper {
     List<ItemUnitEntity> selectPopWishListItem(@Param("userId") String userId,
                                                    @Param("wishListMgntNo") String wishListMgntNo,
                                                    @Param("brandId") String brandId,
-                                                   @Param("storeId") String storeId
+                                                   @Param("storeId") String storeId,  GridRequest gridRequest
+    )throws Exception;
+
+    int selectPopWishListItemCnt(@Param("userId") String userId,
+                                               @Param("wishListMgntNo") String wishListMgntNo,
+                                               @Param("brandId") String brandId,
+                                               @Param("storeId") String storeId
     )throws Exception;
 
 

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

@@ -686,10 +686,10 @@ public class ItemService extends CommonService {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
-        int gridRecords = 0;
-        int gridTotal = 0;
+        int gridRecords = itemUnitMapper.selectPopWishListItemCnt(userId, wishListMgntNo, brandId, storeId);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
 
-        List<ItemUnitEntity> entities = itemUnitMapper.selectPopWishListItem(userId, wishListMgntNo, brandId, storeId);
+        List<ItemUnitEntity> entities = itemUnitMapper.selectPopWishListItem(userId, wishListMgntNo, brandId, storeId, gridRequest);
         List<Object> gridRows = entities.stream().
                 map(m -> ItemPopSearchResponse.builder()
                         .viewCd("R")

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

@@ -692,7 +692,7 @@
 
 
     <select id="selectPopWishListItem" resultType="com.oqpo.api.entity.stinfo.ItemUnitEntity">
-        select  /* selectPopItemStoreWishGridList */
+        select  /* selectPopWishListItem */
                iInfo.item_id,iInfo.item_nm,iInfo.podr_pssbl_dvsn, fn_code_nm('PODR_PSSBL_DVSN',iInfo.podr_pssbl_dvsn) AS podr_pssbl_dvsn_nm
                ,sInfo.unit, fn_code_nm('DSTRBT_COST_UNIT', sInfo.unit) as unit_nm, sInfo.stdd_qty, sInfo.unit_amt
                , sInfo.store_unit_unq_no,'S' as unit_gubun, sInfo.brand_unit_unq_no
@@ -705,5 +705,37 @@
         and date_format(now(),'%Y%m%d') between sInfo.cont_stt_dt and sInfo.cont_end_dt
         where iInfo.brand_id =  #{brandId}
         AND   iInfo.item_st_cd = 'IS00'
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by iInfo.item_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by iInfo.item_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by iInfo.item_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectPopWishListItemCnt" resultType="int">
+        select  /* selectPopWishListItemCnt */
+                count(*) as cnt
+        from item_base_info iInfo
+        join store_base_info store on iInfo.brand_id = store.brand_id   and store.store_id = #{storeId}
+        join store_item_unit_info sInfo on iInfo.brand_id = sInfo.brand_id and iInfo.item_id = sInfo.item_id and sInfo.unit_target_cd = 'Y'
+        join store_wish_list_mgnt wish on wish_list_mgnt_no =  #{wishListMgntNo}  and wish.store_id = store.store_id and wish.del_yn = 'N'
+        join store_wish_list_ptcl wishptcl on wish.wish_list_mgnt_no = wishptcl.wish_list_mgnt_no and wishptcl.item_id = iInfo.item_id and wishptcl.del_yn = 'N'
+        and store.store_id = sInfo.store_id  and sInfo.store_id =  #{storeId}
+        and date_format(now(),'%Y%m%d') between sInfo.cont_stt_dt and sInfo.cont_end_dt
+        where iInfo.brand_id =  #{brandId}
+        AND   iInfo.item_st_cd = 'IS00'
     </select>
 </mapper>

src/main/resources/mybatis/sqlmaps/system/Auth.xml

@@ -105,7 +105,7 @@
         (auth_no, menu_no, use_yn, wr_yn, add_dt, add_id, chg_dt, chg_id)
         values
         <foreach collection="gridUpdateData" item="item" separator=",">
-            ( #{item.authNo},#{item.menuNo},#{item.readYn},#{item.writeYn}, now(), #{userId}, now(), #{userId})
+            ( #{item.authNo},#{item.menuNo}, case when #{item.readYn} = 'N' and #{item.writeYn} = 'N' then 'N' else 'Y' end ,#{item.writeYn}, now(), #{userId}, now(), #{userId})
         </foreach>
         on duplicate key
         update