매장 정산타입

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

@@ -74,6 +74,7 @@ public class StoreBaseInfoService extends CommonService {
                         .storeNm(m.getStoreNm())
                         .storeStCd(m.getStoreStCd())
                         .storeStNm(m.getStoreStNm())
+                        .loanDvsn(m.getLoanDvsn())      // 정산타입
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

src/main/java/com/oqpo/api/web/dto/response/stinfo/store/StorePopSearchResponse.java

@@ -31,4 +31,7 @@ public class StorePopSearchResponse {
 
     @ApiModelProperty(value = "상태명")
     private String storeStNm;
+
+    @ApiModelProperty(value = "정산타입")
+    private String loanDvsn;
 }

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

@@ -5,26 +5,28 @@
 
     <select id="selectPopStoreGridList" resultType="com.oqpo.api.entity.stinfo.StoreBaseInfoEntity">
         select /* selectPopStoreGridList */
-               brand_id, fn_brand_nm(brand_id) as brand_nm, store_id, store_nm, store_st_cd, fn_code_nm('STORE_ST_CD',store_st_cd) as store_st_nm
-        from store_base_info
+            A.brand_id, fn_brand_nm(A.brand_id) as brand_nm,
+            A.store_id, A.store_nm, A.store_st_cd, fn_code_nm('STORE_ST_CD', A.store_st_cd) as store_st_nm,
+            A.loan_dvsn
+        from store_base_info A
         where 1=1
-        and brand_id = #{sBrandId}
+        and A.brand_id = #{sBrandId}
         <if test="sStoreNm != null and sStoreNm != ''">
-            and store_nm like concat('%',#{sStoreNm},'%')
+            and A.store_nm like concat('%',#{sStoreNm},'%')
         </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
                     <if test="gridRequest.sord == 'asc'.toString()">
-                        order by store_nm asc
+                        order by A.store_nm asc
                     </if>
                     <if test="gridRequest.sord == 'desc'.toString()">
-                        order by store_nm desc
+                        order by A.store_nm desc
                     </if>
                 </if>
             </when>
             <otherwise>
-                order by store_nm asc
+                order by A.store_nm asc
             </otherwise>
         </choose>
         <if test="gridRequest.pagingYn == true">