From 3b72208643fcfb43f85f2ce713cc1afc06581ed5 Mon Sep 17 00:00:00 2001
From: chen <1251790704@qq.com>
Date: Wed, 25 Nov 2020 15:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/response/GuaranteeLetterListResponse.java    |  6 +++---
 .../model/response/LoanNoticeListResponse.java         |  6 +++---
 .../response/PaymentConfirmationListResponse.java      |  6 +++---
 .../guarantee/DgGuaranteeLetterAssignUserMapper.xml    | 10 +++++-----
 .../resources/mapper/guarantee/DgLoanNoticeMapper.xml  |  7 ++++---
 .../guarantee/DgPaymentConfirmationConsiderMapper.xml  | 10 +++++-----
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java
index 6f96b5d3..4ebf905b 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java
@@ -30,7 +30,7 @@ public class GuaranteeLetterListResponse {
 
     @ApiModelProperty("贷审会同意时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date updateTime;
+    private Date passingTime;
 
     @ApiModelProperty("附件（会议记录）")
     private String file;
@@ -53,11 +53,11 @@ public class GuaranteeLetterListResponse {
 
     @ApiModelProperty("金额")
     @ExcelProperty(value = "金额",index = 4)
-    private Double applyAmount;
+    private Double loanMoney;
 
     @ApiModelProperty("期限")
     @ExcelProperty(value = "期数",index = 5)
-    private String applyTime;
+    private String loanTern;
 
     @ApiModelProperty("申请日期")
     @ExcelProperty(value = "申请日期",index = 6)
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java
index cc48aee2..25ffafa9 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java
@@ -46,11 +46,11 @@ public class LoanNoticeListResponse {
 
     @ApiModelProperty("金额")
     @ExcelProperty(value = "金额",index = 4)
-    private Double applyAmount;
+    private Double loanMoney;
 
-    @ApiModelProperty("期限")
+    @ApiModelProperty("期数")
     @ExcelProperty(value = "期数",index = 5)
-    private String applyTime;
+    private String loanTern;
 
     @ApiModelProperty("申请日期")
     @ExcelProperty(value = "申请日期",index = 6)
diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java
index a156079f..13f4a00c 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java
@@ -30,7 +30,7 @@ public class PaymentConfirmationListResponse {
 
     @ApiModelProperty("贷审会同意时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-    private Date updateTime;
+    private Date passingTime;
 
     @ApiModelProperty("附件（会议记录）")
     private String file;
@@ -53,11 +53,11 @@ public class PaymentConfirmationListResponse {
 
     @ApiModelProperty("金额")
     @ExcelProperty(value = "金额",index = 4)
-    private Double applyAmount;
+    private Double loanMoney;
 
     @ApiModelProperty("期限")
     @ExcelProperty(value = "期数",index = 5)
-    private String applyTime;
+    private String loanTern;
 
     @ApiModelProperty("申请日期")
     @ExcelProperty(value = "申请日期",index = 6)
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml
index 406d2cb6..5bef8979 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml
@@ -17,14 +17,14 @@
         <id column="id" property="id" />
         <result column="business_code" property="businessCode" />
         <result column="bank" property="bank" />
-        <result column="update_time" property="updateTime" />
+        <result column="passing_time" property="passingTime" />
         <result column="file" property="file" />
         <result column="name" property="name" />
         <result column="phone" property="phone" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
-        <result column="apply_time" property="applyTime" />
-        <result column="apply_amount" property="applyAmount" />
+        <result column="loan_tern" property="loanTern" />
+        <result column="loan_money" property="loanMoney" />
         <result column="business_type" property="businessType" />
         <result column="audit_opinion" property="auditOpinion" />
         <result column="operating_status" property="operatingStatus" />
@@ -32,8 +32,8 @@
     </resultMap>
 
     <select id="pageByCondition" resultMap="GuaranteeLetterListResponseMap">
-        select lau.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money as apply_amount,lcc.loan_tern as apply_time,
-        aai.create_time,lau.status,aai.bank,lcc.update_time,lcc.file,lau.audit_opinion,lau.operating_status,bps.business_status
+        select lau.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time,
+        lau.status,aai.bank,lcc.passing_time,lcc.file,lau.audit_opinion,lau.operating_status,bps.business_status
         from dg_guarantee_letter_assign_user lau
         left join dg_apply_amount_info aai on lau.business_id = aai.id
         left join crms_company_customer ccc on lau.company_id = ccc.id
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml
index fc5a8821..e858c0a1 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml
@@ -21,8 +21,8 @@
         <result column="phone" property="phone" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
-        <result column="apply_time" property="applyTime" />
-        <result column="apply_amount" property="applyAmount" />
+        <result column="loan_tern" property="loanTern" />
+        <result column="loan_money" property="loanMoney" />
         <result column="business_type" property="businessType" />
         <result column="audit_opinion" property="auditOpinion" />
         <result column="operating_status" property="operatingStatus" />
@@ -30,12 +30,13 @@
     </resultMap>
 
     <select id="pageByCondition" resultMap="LoanNoticeListResponseMap">
-        select ln.id,aai.business_code,cc.name,cc.phone,aai.business_type,aai.apply_amount,aai.apply_time,
+        select ln.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_tern,lcc.loan_money,
         aai.create_time,ln.status,aai.bank,ln.audit_opinion,ln.operating_status,bps.business_status
         from dg_loan_notice ln
         left join dg_apply_amount_info aai on ln.business_id = aai.id
         left join crms_company_customer ccc on ln.company_id = ccc.id
         left join crms_customer cc on ccc.customer_id = cc.id
+        left join dg_loan_committee_consider lcc on ln.business_id = lcc.business_id
         left join dg_business_process_status bps on ln.business_id = bps.business_id
         <where>
             AND ln.role_id = #{roleId}
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml
index 9e3cd102..c176490c 100644
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml
+++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml
@@ -18,14 +18,14 @@
         <id column="id" property="id" />
         <result column="business_code" property="businessCode" />
         <result column="bank" property="bank" />
-        <result column="update_time" property="updateTime" />
+        <result column="passing_time" property="passingTime" />
         <result column="file" property="file" />
         <result column="name" property="name" />
         <result column="phone" property="phone" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
-        <result column="apply_time" property="applyTime" />
-        <result column="apply_amount" property="applyAmount" />
+        <result column="loan_tern" property="loanTern" />
+        <result column="loan_money" property="loanMoney" />
         <result column="business_type" property="businessType" />
         <result column="audit_opinion" property="auditOpinion" />
         <result column="operating_status" property="operatingStatus" />
@@ -33,8 +33,8 @@
     </resultMap>
 
     <select id="pageByCondition" resultMap="PaymentConfirmationListResponseMap">
-        select pcc.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money as apply_amount,lcc.loan_tern as apply_time,
-        aai.create_time,pcc.status,aai.bank,lcc.update_time,lcc.file,pcc.audit_opinion,pcc.operating_status,bps.business_status
+        select pcc.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time,
+        pcc.status,aai.bank,lcc.passing_time,lcc.file,pcc.audit_opinion,pcc.operating_status,bps.business_status
         from dg_payment_confirmation_consider pcc
         left join dg_apply_amount_info aai on pcc.business_id = aai.id
         left join crms_company_customer ccc on pcc.company_id = ccc.id