Explorar el Código

정산 검수 현황

marseyes hace 2 años
padre
commit
3ec63bb58e

+ 6 - 0
src/main/java/com/oqpo/api/web/dto/response/sttlmng/SttlMngInfoResponse.java

@@ -25,6 +25,10 @@ public class SttlMngInfoResponse {
25 25
     private String storeId;
26 26
     @ApiModelProperty(value = "매장명")
27 27
     private String storeNm;
28
+    @ApiModelProperty(value = "공급사아이디")
29
+    private String spplyId;
30
+    @ApiModelProperty(value = "공급사명")
31
+    private String spplyNm;
28 32
     @ApiModelProperty(value = "정산상태코드")
29 33
     private String sttlStCd;
30 34
     @ApiModelProperty(value = "정산상태명")
@@ -62,6 +66,8 @@ public class SttlMngInfoResponse {
62 66
                 .brandNm(entity.getBrandNm())
63 67
                 .storeId(entity.getStoreId())
64 68
                 .storeNm(entity.getStoreNm())
69
+                .spplyId(entity.getSpplyId())
70
+                .spplyNm(entity.getSpplyNm())
65 71
                 .sttlStCd(entity.getSttlStCd())
66 72
                 .sttlStNm(entity.getSttlStNm())
67 73
                 .sttlReqAmt(entity.getSttlReqAmt())

+ 1 - 0
src/main/resources/mybatis/sqlmaps/sttlmng/SttlReq.xml

@@ -148,6 +148,7 @@
148 148
         SELECT A.sttl_mgnt_unq_no,
149 149
             DATE_FORMAT(A.sttl_req_dt, '%Y.%m.%d') AS sttl_req_dt,
150 150
             A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm,
151
+            A.spply_id, FN_SPPLY_NM(A.spply_id) AS spply_nm,
151 152
             A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
152 153
             A.sttl_st_cd, FN_CODE_NM('STTL_ST_CD', A.sttl_st_cd) AS sttl_st_nm, A.sttl_req_amt,
153 154
             DATE_FORMAT(A.sttl_dt, '%Y.%m.%d') AS sttl_dt,