Explorar el Código

입금관리 수정

marseyes hace 2 años
padre
commit
5146b813e4

+ 5 - 0
src/main/java/com/oqpo/api/entity/loanmng/LoanMgntDsptProcEntity.java

@@ -71,4 +71,9 @@ public class LoanMgntDsptProcEntity implements Serializable {
71 71
     @ApiModelProperty(value = "시스템변경아이디")
72 72
     private String sysChgId;
73 73
 
74
+    @ApiModelProperty(value = "여신구분")
75
+    private String loanDvsn;
76
+    @ApiModelProperty(value = "여신구분명")
77
+    private String loanDvsnNm;
78
+
74 79
 }

+ 2 - 0
src/main/java/com/oqpo/api/service/loanmng/DsptMngService.java

@@ -78,6 +78,8 @@ public class DsptMngService extends CommonService {
78 78
                         .brandNm(m.getBrandNm())
79 79
                         .dpstAuthYn(m.getDpstAuthYn())
80 80
                         .dsptRjctRsn(m.getDsptRjctRsn())
81
+                        .loanDvsn(m.getLoanDvsn())
82
+                        .loanDvsnNm(m.getLoanDvsnNm())
81 83
                         .build())
82 84
                 .collect(Collectors.toList());
83 85
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

+ 5 - 0
src/main/java/com/oqpo/api/web/dto/response/loanmng/DsptMngListResponse.java

@@ -64,4 +64,9 @@ public class DsptMngListResponse {
64 64
     @ApiModelProperty(value = "입금반려사유")
65 65
     private String dsptRjctRsn;
66 66
 
67
+    @ApiModelProperty(value = "여신구분")
68
+    private String loanDvsn;
69
+    @ApiModelProperty(value = "여신구분명")
70
+    private String loanDvsnNm;
71
+
67 72
 }

+ 7 - 1
src/main/resources/mybatis/sqlmaps/loanmng/DsptMng.xml

@@ -15,8 +15,12 @@
15 15
             DATE_FORMAT(A.req_dt, '%Y.%m.%d') AS req_dt,
16 16
             DATE_FORMAT(A.dpst_auth_dt, '%Y.%m.%d') AS dpst_auth_dt,
17 17
             DATE_FORMAT(A.dspt_rjct_dt, '%Y.%m.%d') AS dspt_rjct_dt,
18
-            A.dspt_rjct_rsn
18
+            A.dspt_rjct_rsn,
19
+            B.loan_mgnt_unq_no,                                                 /* 여신관리고유번호 */
20
+            C.loan_dvsn, FN_CODE_NM('LOAN_DVSN', C.loan_dvsn) AS loan_dvsn_nm   /* 정산타입 */
19 21
         FROM loan_mgnt_dspt_proc A
22
+        INNER JOIN store_base_info B ON A.brand_id = B.brand_id AND A.store_id = B.store_id
23
+        INNER JOIN loan_mgnt_base_info C ON B.brand_id = C.brand_id AND B.store_id = B.store_id AND B.loan_mgnt_unq_no = C.loan_mgnt_unq_no
20 24
         WHERE A.brand_id = #{sBrandId}
21 25
         <if test="sStoreId != null and sStoreId != ''">
22 26
             AND A.store_id = #{sStoreId}
@@ -51,6 +55,8 @@
51 55
         /* DsptMngMapper.selectDsptMngGridCnt */
52 56
         SELECT COUNT(*)
53 57
         FROM loan_mgnt_dspt_proc A
58
+        INNER JOIN store_base_info B ON A.brand_id = B.brand_id AND A.store_id = B.store_id
59
+        INNER JOIN loan_mgnt_base_info C ON B.brand_id = C.brand_id AND B.store_id = B.store_id AND B.loan_mgnt_unq_no = C.loan_mgnt_unq_no
54 60
         WHERE A.brand_id = #{sBrandId}
55 61
         <if test="sStoreId != null and sStoreId != ''">
56 62
             AND A.store_id = #{sStoreId}