各页面筛选条件优化

yt-common/src/main/java/com/ytpm/risk/param/RiskBannedListParam.java

@@ -20,6 +20,8 @@ public class RiskBannedListParam extends PageMeta {
     private String channelId;
     @ApiModelProperty("应用ID")
     private String appId;
+    @ApiModelProperty("用户ID")
+    private String userId;
     @ApiModelProperty("加盟商ID")
     private String agentId;
     @ApiModelProperty("渠道类型")

yt-common/src/main/java/com/ytpm/risk/param/RiskDeblockingListParam.java

@@ -25,7 +25,7 @@ public class RiskDeblockingListParam extends PageMeta {
     @ApiModelProperty("解封时间结束")
     private Date deblockingTimeEnd;
     @ApiModelProperty("解封原因")
-    private Date deblockingReason;
+    private String deblockingReason;
     @ApiModelProperty("操作人")
     private String operator;
     @ApiModelProperty("应用ID")

yt-common/src/main/java/com/ytpm/risk/view/RiskBannedListView.java

@@ -58,4 +58,8 @@ public class RiskBannedListView extends PageMeta {
     private Integer bannedType;
     @ApiModelProperty("风控期限")
     private Integer bannedLimit;
+    @ApiModelProperty("渠道ID")
+    private Long ditchId;
+    @ApiModelProperty("渠道名称")
+    private String ditchName;
 }

yt-common/src/main/java/com/ytpm/risk/view/RiskDeblockingListView.java

@@ -45,4 +45,8 @@ public class RiskDeblockingListView extends PageMeta {
     private String deblockingReason;
     @ApiModelProperty("渠道类型")
     private Integer channelType;
+    @ApiModelProperty("渠道ID")
+    private Long ditchId;
+    @ApiModelProperty("渠道名称")
+    private String ditchName;
 }

yt-risk/risk-manage/src/main/resources/mapper/RiskManageMapper.xml

@@ -66,7 +66,9 @@
             pd.operator,
             pd.operator_name,
             a.app_id,
-            a.app_name
+            a.app_name,
+            a.ditch_id,
+            a.ditch_name
         FROM
             yt_platform_deblocking pd
             JOIN yt_app a ON pd.app_id = a.app_id
@@ -75,6 +77,9 @@
         <if test="appId != null and appId != ''">
             and a.app_id = #{appId}
         </if>
+        <if test="channelOrigin != null">
+            and a.ditch_id = #{channelOrigin}
+        </if>
         <if test="deblockingReason != null and deblockingReason != ''">
             and pd.deblocking_reason like concat('%',#{deblockingReason},'%')
         </if>
@@ -99,7 +104,9 @@
         pb.user_id,
         pb.agent_id,
         a.app_id,
-        a.app_name
+        a.app_name,
+        a.ditch_id,
+        a.ditch_name
         FROM
         yt_platform_banned pb
         JOIN yt_app a ON pb.app_id = a.app_id
@@ -108,6 +115,12 @@
         <if test="appId != null and appId != ''">
             and a.app_id = #{appId}
         </if>
+        <if test="userId != null and userId != ''">
+            and pb.user_id = #{userId}
+        </if>
+        <if test="channelOrigin != null">
+            and a.ditch_id = #{channelOrigin}
+        </if>
         <if test="bannedReason != null and bannedReason != ''">
             and pb.banned_reason like concat('%',#{bannedReason},'%')
         </if>