Merge remote-tracking branch 'origin/master'

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

@@ -41,6 +41,10 @@ public class AssetsInvestigationListResponse extends BaseRowModel implements Ser
     @ApiModelProperty(value = "企业id")
     private Integer companyId;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
     /**
      * 申请额度
      */

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

@@ -40,6 +40,10 @@ public class BusinessApplicationListResponse extends BaseRowModel implements Ser
     @ApiModelProperty(value = "业务id")
     private Integer businessId;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
     /**
      * 提单人id
      */

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

@@ -34,6 +34,10 @@ public class GuaranteeListResponse extends BaseRowModel implements Serializable
     @ExcelIgnore
     @ApiModelProperty(value = "业务id")
     private Integer businessId;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
     /**
      * 企业id
      */

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

@@ -41,6 +41,10 @@ public class MessageInvestigationListResponse extends BaseRowModel implements Se
     @ApiModelProperty(value = "企业id")
     private Integer companyId;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "角色id")
+    private Integer roleId;
+
     /**
      * 申请额度
      */

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

@@ -17,7 +17,7 @@
     </resultMap>
 
     <select id="pageByCondition" resultType="com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse">
-        select au.id,ai.company_id,au.business_id,ai.presenter_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        select au.id,au.role_id,ai.company_id,au.business_id,ai.presenter_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
         au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_apply_amount_list au
         left join dg_apply_amount_info ai on au.business_id = ai.id

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

@@ -32,7 +32,7 @@
     </resultMap>
 
     <select id="pageByCondition" resultType="com.daqing.financial.guarantee.model.response.AssetsInvestigationListResponse">
-        select au.id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
         au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_assets_investigation au
         left join dg_apply_amount_info ai on au.business_id = ai.id

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

@@ -20,7 +20,7 @@
     </resultMap>
 
     <select id="pageByCondition" resultType="com.daqing.financial.guarantee.model.response.GuaranteeListResponse">
-        select au.id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
         au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_guarantee_assign_user au
         left join dg_apply_amount_info ai on au.business_id = ai.id

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

@@ -19,7 +19,7 @@
     </resultMap>
 
     <select id="pageByCondition" resultType="com.daqing.financial.guarantee.model.response.MessageInvestigationListResponse">
-        select au.id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
         au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_message_investigation au
         left join dg_apply_amount_info ai on au.business_id = ai.id