미납금관리 수정 및 매장팝업 검색항목 추가

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

@@ -10,8 +10,8 @@ import java.util.List;
 @Mapper
 public interface StoreBaseInfoMapper {
 
-    List<StoreBaseInfoEntity> selectPopStoreGridList(@Param("sBrandId") String brandId, @Param("sStoreNm") String storeNm, GridRequest gridRequest)throws Exception;
-    int selectPopStoreGridCnt(@Param("sBrandId") String brandId, @Param("sStoreNm") String storeNm)throws Exception;
+    List<StoreBaseInfoEntity> selectPopStoreGridList(@Param("sBrandId") String brandId, @Param("sStoreNm") String storeNm, @Param("sLoanDvsn") String sLoanDvsn,  GridRequest gridRequest)throws Exception;
+    int selectPopStoreGridCnt(@Param("sBrandId") String brandId, @Param("sStoreNm") String storeNm, @Param("sLoanDvsn") String sLoanDvsn)throws Exception;
 
     List<StoreBaseInfoEntity> selectStoreGridList( @Param("sBrandId") String sBrandId, @Param("searchDateType") String searchDateType, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sStoreDvsn") String sStoreDvsn, @Param("sStoreStCd") String sStoreStCd, @Param("sLoanDvsn") String sLoanDvsn, @Param("sStoreNm") String sStoreNm, GridRequest gridRequest)throws Exception;
     int selectStoreGridCnt(@Param("sBrandId") String sBrandId, @Param("searchDateType") String searchDateType, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sStoreDvsn") String sStoreDvsn, @Param("sStoreStCd") String sStoreStCd, @Param("sLoanDvsn") String sLoanDvsn, @Param("sStoreNm") String sStoreNm)throws Exception;

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

@@ -70,13 +70,13 @@ public class StoreBaseInfoService extends CommonService {
     /*
       팝업 매장 리스트 조회
      */
-    public GridResponse selectPopBrandGridList(String brandId, String storeNm, GridRequest gridRequest) throws Exception {
+    public GridResponse selectPopBrandGridList(String brandId, String storeNm, String sLoanDvsn, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
-        int gridRecords = storeBaseInfoMapper.selectPopStoreGridCnt(brandId, storeNm);
+        int gridRecords = storeBaseInfoMapper.selectPopStoreGridCnt(brandId, storeNm, sLoanDvsn);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<StoreBaseInfoEntity> entities = storeBaseInfoMapper.selectPopStoreGridList(brandId, storeNm, gridRequest);
+        List<StoreBaseInfoEntity> entities = storeBaseInfoMapper.selectPopStoreGridList(brandId, storeNm,sLoanDvsn,  gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> StorePopSearchResponse.builder()
                         .viewCd("R")

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

@@ -57,7 +57,7 @@ public class StoreController {
     @ApiOperation(value = " 팝업 매장 그리드 리스트")
     @PostMapping("/pop-grid-list")
     public ResponseEntity<GridResponse> brandPopGridList(@RequestBody @Valid StorePopGridRequest storePopGridRequest) throws Exception {
-        return ResponseEntity.ok(storeBaseInfoService.selectPopBrandGridList(storePopGridRequest.getBrandId(), storePopGridRequest.getStoreNm(), storePopGridRequest.toDTO(storePopGridRequest)));
+        return ResponseEntity.ok(storeBaseInfoService.selectPopBrandGridList(storePopGridRequest.getBrandId(), storePopGridRequest.getStoreNm(),storePopGridRequest.getSLoanDvsn() , storePopGridRequest.toDTO(storePopGridRequest)));
     }
 
 

src/main/java/com/oqpo/api/web/dto/request/stinfo/store/StorePopGridRequest.java

@@ -19,6 +19,9 @@ public class StorePopGridRequest extends GridRequest {
     @ApiModelProperty(value = "매장명")
     private String storeNm;
 
+    @ApiModelProperty(value = "여신구분")
+    private String sLoanDvsn;
+
 
     protected StorePopGridRequest(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/Store.xml

@@ -14,6 +14,9 @@
         <if test="sStoreNm != null and sStoreNm != ''">
             and A.store_nm like concat('%',#{sStoreNm},'%')
         </if>
+        <if test="sLoanDvsn != null and sLoanDvsn != ''">
+            and A.loan_dvsn = #{sLoanDvsn}
+        </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
@@ -43,6 +46,9 @@
         <if test="sStoreNm != null and sStoreNm != ''">
             and store_nm like concat('%',#{sStoreNm},'%')
         </if>
+        <if test="sLoanDvsn != null and sLoanDvsn != ''">
+            and loan_dvsn = #{sLoanDvsn}
+        </if>
     </select>
 
     <select id="selectStoreGridList" resultType="com.oqpo.api.entity.stinfo.StoreBaseInfoEntity">