Browse Source

미납금관리

marseyes 2 years ago
parent
commit
0379ff1e62

+ 2 - 0
src/main/java/com/oqpo/api/entity/settmng/StlMgntBaseInfoEntity.java

@@ -32,6 +32,8 @@ public class StlMgntBaseInfoEntity implements Serializable {
32
     private String sttlStCd;
32
     private String sttlStCd;
33
     @ApiModelProperty(value = "정산상태명")
33
     @ApiModelProperty(value = "정산상태명")
34
     private String sttlStNm;
34
     private String sttlStNm;
35
+    @ApiModelProperty(value = "정산부가상태명")
36
+    private String sttlAddStNm;
35
     @ApiModelProperty(value = "정산요청금액")
37
     @ApiModelProperty(value = "정산요청금액")
36
     private Long sttlReqAmt;
38
     private Long sttlReqAmt;
37
     @ApiModelProperty(value = "정산일자")
39
     @ApiModelProperty(value = "정산일자")

+ 1 - 0
src/main/java/com/oqpo/api/service/loanmng/UnpaidMngService.java

@@ -48,6 +48,7 @@ public class UnpaidMngService extends CommonService {
48
                         .storeNm(m.getStoreNm())
48
                         .storeNm(m.getStoreNm())
49
                         .sttlStCd(m.getSttlStCd())
49
                         .sttlStCd(m.getSttlStCd())
50
                         .sttlStNm(m.getSttlStNm())
50
                         .sttlStNm(m.getSttlStNm())
51
+                        .sttlAddStNm(m.getSttlAddStNm())
51
                         .sttlReqAmt(m.getSttlReqAmt())      /* 정산요청금액 */
52
                         .sttlReqAmt(m.getSttlReqAmt())      /* 정산요청금액 */
52
                         .sttlDt(m.getSttlDt())              /* 정산확정일자 */
53
                         .sttlDt(m.getSttlDt())              /* 정산확정일자 */
53
                         .sttlAmt(m.getSttlAmt())            /* 정산확정금액 */
54
                         .sttlAmt(m.getSttlAmt())            /* 정산확정금액 */

+ 2 - 0
src/main/java/com/oqpo/api/web/dto/response/loanmng/UnpaidMngListResponse.java

@@ -26,6 +26,8 @@ public class UnpaidMngListResponse {
26
     private String storeNm;
26
     private String storeNm;
27
     @ApiModelProperty(value = "정산상태코드")
27
     @ApiModelProperty(value = "정산상태코드")
28
     private String sttlStCd;
28
     private String sttlStCd;
29
+    @ApiModelProperty(value = "정산부가상태명")
30
+    private String sttlAddStNm;
29
     @ApiModelProperty(value = "정산상태명")
31
     @ApiModelProperty(value = "정산상태명")
30
     private String sttlStNm;
32
     private String sttlStNm;
31
     @ApiModelProperty(value = "정산요청일자")
33
     @ApiModelProperty(value = "정산요청일자")

+ 3 - 2
src/main/resources/mybatis/sqlmaps/loanmng/UnpaidMng.xml

@@ -20,6 +20,7 @@
20
             stl.sttl_amt,               /* 정산확정금액 */
20
             stl.sttl_amt,               /* 정산확정금액 */
21
             stl.rcpt_amt,               /* 수납금액 */
21
             stl.rcpt_amt,               /* 수납금액 */
22
             (IFNULL(stl.sttl_amt, stl.sttl_req_amt) - IFNULL(stl.rcpt_amt, 0)) AS unpaid_amt,       /* 미납금액 */
22
             (IFNULL(stl.sttl_amt, stl.sttl_req_amt) - IFNULL(stl.rcpt_amt, 0)) AS unpaid_amt,       /* 미납금액 */
23
+            stl.sttl_st_cd, FN_CODE_NM('STTL_ST_CD', stl.sttl_st_cd) AS sttl_st_nm,                 /* 정산상태코드 */
23
             <![CDATA[
24
             <![CDATA[
24
             CASE WHEN store.sttl_req_cfrm_term > 0 AND store.sttl_rcp_amt_term > 0 THEN
25
             CASE WHEN store.sttl_req_cfrm_term > 0 AND store.sttl_rcp_amt_term > 0 THEN
25
                     CASE WHEN stl.sttl_req_dt IS NULL THEN '정산요청전'
26
                     CASE WHEN stl.sttl_req_dt IS NULL THEN '정산요청전'
@@ -35,9 +36,9 @@
35
                 END
36
                 END
36
                 END
37
                 END
37
                 ELSE '정산대기'
38
                 ELSE '정산대기'
38
-            END AS sttl_st_nm,         /* 상태 */
39
+            END AS sttl_add_st_nm,          /* 정산부가상태 */
39
             ]]>
40
             ]]>
40
-            stl.sttl_mgnt_unq_no      /* 정산관리고유번호 */
41
+            stl.sttl_mgnt_unq_no            /* 정산관리고유번호 */
41
         FROM store_base_info store
42
         FROM store_base_info store
42
         INNER JOIN loan_mgnt_base_info loan
43
         INNER JOIN loan_mgnt_base_info loan
43
             ON store.loan_mgnt_unq_no = loan.loan_mgnt_unq_no
44
             ON store.loan_mgnt_unq_no = loan.loan_mgnt_unq_no