정산요청 그리드

src/main/java/com/oqpo/api/entity/settmng/StlMgntBaseInfoEntity.java

@@ -64,6 +64,10 @@ public class StlMgntBaseInfoEntity implements Serializable {
     private String rcptYn;
     @ApiModelProperty(value = "수납일자(후불사용)")
     private String rcptDt;
+    @ApiModelProperty(value = "수납금액(후불사용)")
+    private Long rcptAmt;
+    @ApiModelProperty(value = "미납금액(후불사용)")
+    private Long unpaidAmt;
 
     @ApiModelProperty(value = "계좌잔액")
     private Long acctBal;

src/main/java/com/oqpo/api/service/sttlmng/SttlStateService.java

@@ -53,15 +53,17 @@ public class SttlStateService extends CommonService {
                         .storeNm(m.getStoreNm())
                         .spplyId(m.getSpplyNm())
                         .spplyNm(m.getSpplyNm())
-                        .sttlStCd(m.getSttlStCd())                  /* 정산상태코드 */
-                        .sttlStNm(m.getSttlStNm())                  /* 정산상태명 */
-                        .sttlReqDt(m.getSttlReqDt())
+                        .sttlStCd(m.getSttlStCd())          /* 정산상태코드 */
+                        .sttlStNm(m.getSttlStNm())          /* 정산상태명 */
+                        .sttlReqDt(m.getSttlReqDt())        /* 정산요청일자 */
+                        .sttlDt(m.getSttlDt())              /* 정산확정일자 */
                         .sttlReqAmt(m.getSttlReqAmt())
-                        .sttlDt(m.getSttlDt())
                         .sttlAmt(m.getSttlAmt())
-                        .acctBal(m.getAcctBal())
+                        .unpaidAmt(m.getUnpaidAmt())
                         .sttlRegMgrId(m.getSttlRegMgrId())
                         .sttlRegMgrNm(m.getSttlRegMgrNm())
+                        .loanDvsn(m.getLoanDvsn())
+                        .loanDvsnNm(m.getLoanDvsnNm())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

src/main/java/com/oqpo/api/web/dto/response/sttlmng/SttlStateGridResponse.java

@@ -33,20 +33,27 @@ public class SttlStateGridResponse {
     private String sttlStCd;
     @ApiModelProperty(value = "정산상태명")
     private String sttlStNm;
+
     @ApiModelProperty(value = "정산요청일자")
     private String sttlReqDt;
+    @ApiModelProperty(value = "정산확정일자")
+    private String sttlDt;
+
     @ApiModelProperty(value = "정산요청금액")
     private Long sttlReqAmt;
-    @ApiModelProperty(value = "정산일자")
-    private String sttlDt;
-    @ApiModelProperty(value = "정산금액")
+    @ApiModelProperty(value = "정산확정금액")
     private Long sttlAmt;
-    @ApiModelProperty(value = "계좌잔액")
-    private Long acctBal;
+    @ApiModelProperty(value = "미납금액(후불사용)")
+    private Long unpaidAmt;
 
     @ApiModelProperty(value = "정산등록담당자아이디")
     private String sttlRegMgrId;
     @ApiModelProperty(value = "정산등록담당자명")
     private String sttlRegMgrNm;
 
+    @ApiModelProperty(value = "여신구분")
+    private String loanDvsn;
+    @ApiModelProperty(value = "여신구분명")
+    private String loanDvsnNm;
+
 }

src/main/resources/mybatis/sqlmaps/sttlmng/SttlState.xml

@@ -7,14 +7,19 @@
         /* SttlStateMapper.selectSttlStateGridList */
         SELECT A.sttl_mgnt_unq_no,
             DATE_FORMAT(A.sttl_req_dt, '%Y.%m.%d') AS sttl_req_dt,
+            DATE_FORMAT(A.sttl_dt, '%Y.%m.%d') AS sttl_dt,
             A.brand_id, FN_BRAND_NM(A.brand_id) AS brand_nm,
             A.store_id, FN_STORE_NM(A.brand_id, A.store_id) AS store_nm,
             A.spply_id, FN_SPPLY_NM(A.spply_id) AS spply_nm,
             A.sttl_st_cd, FN_CODE_NM('STTL_ST_CD', A.sttl_st_cd) AS sttl_st_nm,
-            A.sttl_req_amt,
-            DATE_FORMAT(A.sttl_dt, '%Y.%m.%d') AS sttl_dt, A.sttl_amt, A.sttl_reg_mgr_nm, A.sttl_reg_mgr_id,
-            A.sttl_req_amt - IFNULL(A.sttl_amt, 0) AS acct_bal
+            A.sttl_req_amt,         /* 정산요청금액 */
+            A.sttl_amt,             /* 정산확정금액 */
+            A.rcpt_amt,             /* 수납금액 */
+            (A.sttl_amt - IFNULL(A.rcpt_amt, 0)) AS unpaid_amt,     /* 미납금액 */
+            A.sttl_reg_mgr_nm, A.sttl_reg_mgr_id,
+            B.loan_dvsn, FN_CODE_NM('LOAN_DVSN', B.loan_dvsn) AS loan_dvsn_nm
         FROM stl_mgnt_base_info A
+        INNER JOIN store_base_info B ON A.brand_id = B.brand_id AND A.store_id = B.store_id
         WHERE A.brand_id = #{sBrandId}
         AND A.sttl_req_dt BETWEEN #{fromDt} AND #{toDt}
         AND A.sttl_st_cd IN ('ST10','ST20','ST30')
@@ -59,6 +64,7 @@
         /* SttlStateMapper.selectSttlStateGridCnt */
         SELECT COUNT(*)
         FROM stl_mgnt_base_info A
+        INNER JOIN store_base_info B ON A.brand_id = B.brand_id AND A.store_id = B.store_id
         WHERE A.brand_id = #{sBrandId}
         AND A.sttl_req_dt BETWEEN #{fromDt} AND #{toDt}
         AND A.sttl_st_cd IN ('ST10','ST20','ST30')