수정

src/main/java/com/oqpo/api/service/loanmng/LoanStateService.java

@@ -62,25 +62,25 @@ public class LoanStateService extends CommonService {
                 .map(m -> LoanStateListResponse.builder()
                         .viewCd("R")
                         .loanMgntUnqNo(m.getLoanMgntUnqNo())
-                        .storeId(m.getStoreId())
-                        .storeNm(m.getStoreNm())
-                        .brandId(m.getBrandId())
-                        .brandNm(m.getBrandNm())
-                        .loanDvsn(m.getLoanDvsn())
-                        .loanDvsnNm(m.getLoanDvsnNm())
-                        .credtLimitAmt(m.getCredtLimitAmt())
-                        .chrgeLimitAmt(m.getChrgeLimitAmt())
-                        .credtLimitUseYn(m.getCredtLimitUseYn())
-                        .useAmtTotal(m.getUseAmtTotal())
-                        .acctBal(m.getAcctBal())
-                        .limitAmt(m.getLimitAmt()) // 한도금액
-                        .posbLimitAmt(m.getPosbLimitAmt()) // 가용한도금액
-                        .tmpRcvAcctTotal(m.getTmpRcvAcctTotal())
-                        .useYn(m.getUseYn())
-                        .useYnNm(m.getUseYnNm())
-                        .sysChgDttm(m.getSysChgDttm())
-                        .sysChgId(m.getSysChgId())
-                        .sysChgNm(m.getSysChgNm())
+                        .storeId(m.getStoreId() == null ? "" : m.getStoreId())
+                        .storeNm(m.getStoreNm() == null ? "" : m.getStoreNm())
+                        .brandId(m.getBrandId() == null ? "" : m.getBrandId())
+                        .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
+                        .loanDvsn(m.getLoanDvsn() == null ? "" : m.getLoanDvsn())
+                        .loanDvsnNm(m.getLoanDvsnNm() == null ? "" : m.getLoanDvsnNm())
+                        .credtLimitAmt(m.getCredtLimitAmt() == null ? 0 : m.getCredtLimitAmt())
+                        .chrgeLimitAmt(m.getChrgeLimitAmt() == null ? 0 : m.getChrgeLimitAmt())
+                        .credtLimitUseYn(m.getCredtLimitUseYn() == null ? "" : m.getCredtLimitUseYn())
+                        .useAmtTotal(m.getUseAmtTotal() == null ? 0 : m.getUseAmtTotal())
+                        .acctBal(m.getAcctBal() == null ? 0 : m.getAcctBal())
+                        .limitAmt(m.getLimitAmt() == null ? 0 : m.getLimitAmt()) // 한도금액
+                        .posbLimitAmt(m.getPosbLimitAmt() == null ? 0 : m.getPosbLimitAmt()) // 가용한도금액
+                        .tmpRcvAcctTotal(m.getTmpRcvAcctTotal() == null ? 0 : m.getTmpRcvAcctTotal())
+                        .useYn(m.getUseYn() == null ? "" : m.getUseYn())
+                        .useYnNm(m.getUseYnNm() == null ? "" : m.getUseYnNm())
+                        .sysChgDttm(m.getSysChgDttm() == null ? "" : m.getSysChgDttm())
+                        .sysChgId(m.getSysChgId() == null ? "" : m.getSysChgId())
+                        .sysChgNm(m.getSysChgNm() == null ? "" : m.getSysChgNm())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

src/main/resources/mybatis/sqlmaps/inoutmng/ShmtOdr.xml

@@ -340,7 +340,7 @@
         , (select sum(podr_amt) from  pch_odr_dtl_ptcl where pch_podr_unq_no = #{pchPodrUnqNo} and podr_dtl_st_cd = 'POD0' ) as podr_total_amt
         , base.whs_id, fn_whs_nm(base.brand_id, base.whs_id) as whs_nm
         , base.location, fn_whs_location_nm(brand_id, base.whs_id, base.location) as location_nm
-        , fn_get_telno((select tel_no from store_base_info where store_id = base.store_id )) as deli_tel_no
+        , fn_get_telno((select MGR_TEL_NO from whs_mgnt_base_info where brand_id = base.brand_id and whs_id = base.whs_id)) as deli_tel_no
     from    pch_odr_base_info base
     where  1=1
     and    base.brand_id = #{brandId}