Merge remote-tracking branch 'origin/master'

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

@@ -28,6 +28,11 @@ public class LoanNoticeListResponse {
     @ApiModelProperty("唯一标识")
     private Integer id;
 
+    @ExcelIgnore
+    @ApiModelProperty("贷审会同意时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date passingTime;
+
     @ExcelIgnore
     @ApiModelProperty("业务id")
     private Integer businessId;

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

@@ -29,11 +29,12 @@
         <result column="business_status" property="businessStatus" />
         <result column="business_id" property="businessId" />
         <result column="role_id" property="roleId" />
+        <result column="passing_time" property="passingTime" />
     </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,ln.role_id,
-        aai.create_time,ln.status,aai.bank,ln.audit_opinion,ln.operating_status,bps.business_status,ln.business_id
+        aai.create_time,ln.status,aai.bank,ln.audit_opinion,ln.operating_status,bps.business_status,ln.business_id,lcc.passing_time
         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