Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/pom.xml

@@ -58,6 +58,12 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.deepoove</groupId>
+            <artifactId>poi-tl</artifactId>
+            <version>1.8.2</version>
+        </dependency>
+
         <!-- lombok需要的jar包 -->
 <!--        <dependency>
             <groupId>org.projectlombok</groupId>
@@ -71,11 +77,11 @@
             <scope>compile</scope>
         </dependency>
         <!-- MP 核心库 -->
-                <dependency>
-                    <groupId>com.baomidou</groupId>
-                    <artifactId>mybatis-plus-boot-starter</artifactId>
-                    <version>3.0.7.1</version>
-                </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.0.7.1</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeLetterListResponse.java

@@ -24,6 +24,10 @@ public class GuaranteeLetterListResponse {
     @ApiModelProperty("法规经理唯一标识")
     private Integer isFgJl;
 
+    @ExcelIgnore
+    @ApiModelProperty("业务id")
+    private Integer businessId;
+
     @ExcelIgnore
     @ApiModelProperty("唯一标识")
     private Integer id;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/LoanNoticeListResponse.java

@@ -24,6 +24,10 @@ public class LoanNoticeListResponse {
     @ApiModelProperty("唯一标识")
     private Integer id;
 
+    @ExcelIgnore
+    @ApiModelProperty("业务id")
+    private Integer businessId;
+
     @ExcelIgnore
     @ApiModelProperty(value = "审核意见")
     private String auditOpinion;

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/PaymentConfirmationListResponse.java

@@ -24,6 +24,10 @@ public class PaymentConfirmationListResponse {
     @ApiModelProperty("唯一标识")
     private Integer id;
 
+    @ExcelIgnore
+    @ApiModelProperty("业务id")
+    private Integer businessId;
+
     @ExcelIgnore
     @ApiModelProperty(value = "审核意见")
     private String auditOpinion;

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml

@@ -29,11 +29,12 @@
         <result column="audit_opinion" property="auditOpinion" />
         <result column="operating_status" property="operatingStatus" />
         <result column="business_status" property="businessStatus" />
+        <result column="business_id" property="businessId" />
     </resultMap>
 
     <select id="pageByCondition" resultMap="GuaranteeLetterListResponseMap">
         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
+        lau.status,aai.bank,lcc.passing_time,lcc.file,lau.audit_opinion,lau.operating_status,bps.business_status,lau.business_id
         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

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml

@@ -27,11 +27,12 @@
         <result column="audit_opinion" property="auditOpinion" />
         <result column="operating_status" property="operatingStatus" />
         <result column="business_status" property="businessStatus" />
+        <result column="business_id" property="businessId" />
     </resultMap>
 
     <select id="pageByCondition" resultMap="LoanNoticeListResponseMap">
         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
+        aai.create_time,ln.status,aai.bank,ln.audit_opinion,ln.operating_status,bps.business_status,ln.business_id
         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

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml

@@ -30,11 +30,12 @@
         <result column="audit_opinion" property="auditOpinion" />
         <result column="operating_status" property="operatingStatus" />
         <result column="business_status" property="businessStatus" />
+        <result column="business_id" property="businessId" />
     </resultMap>
 
     <select id="pageByCondition" resultMap="PaymentConfirmationListResponseMap">
         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
+        pcc.status,aai.bank,lcc.passing_time,lcc.file,pcc.audit_opinion,pcc.operating_status,bps.business_status,pcc.business_id
         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