渠道规则开发3(发佣检核查询与导出、发佣关账查询与导出 增加渠道查询条件)

yd-api/src/main/java/com/yd/api/agms/vo/fortune/CommissionPayoutStatusQueryRequestVO.java

@@ -67,7 +67,15 @@ public class CommissionPayoutStatusQueryRequestVO {
     private Long s3Id;
     private Long s3Id;
     private Long s2Id;
     private Long s2Id;
     private Long s1Id;
     private Long s1Id;
-
+    /**
+     * 渠道Id
+     */
+    private Long channelId;
+    /**
+     * 渠道类型: 对公:1; 对私:2
+     */
+    private String channelType;
+    
     private PageInfo<CommissionPayoutStatus> page;
     private PageInfo<CommissionPayoutStatus> page;
 
 
     public Long getInsurerId() {
     public Long getInsurerId() {
@@ -212,5 +220,22 @@ public class CommissionPayoutStatusQueryRequestVO {
     public void setCommissionTypeDropOptionCodeList(List<String> commissionTypeDropOptionCodeList) {
     public void setCommissionTypeDropOptionCodeList(List<String> commissionTypeDropOptionCodeList) {
         this.commissionTypeDropOptionCodeList = commissionTypeDropOptionCodeList;
         this.commissionTypeDropOptionCodeList = commissionTypeDropOptionCodeList;
     }
     }
+
+	public Long getChannelId() {
+		return channelId;
+	}
+
+	public void setChannelId(Long channelId) {
+		this.channelId = channelId;
+	}
+
+	public String getChannelType() {
+		return channelType;
+	}
+
+	public void setChannelType(String channelType) {
+		this.channelType = channelType;
+	}
+    
 }
 }
 
 

yd-api/src/main/java/com/yd/api/agms/vo/fortune/ExportFortunePayRequestVO.java

@@ -45,6 +45,8 @@ public class ExportFortunePayRequestVO {
     private Long s3Id;
     private Long s3Id;
     private Long s2Id;
     private Long s2Id;
     private Long s1Id;
     private Long s1Id;
+    private Long channelId;
+    private String channelType;
 
 
     /**
     /**
      * 获取 预计发佣年月
      * 获取 预计发佣年月
@@ -205,4 +207,21 @@ public class ExportFortunePayRequestVO {
                 ", commissionPayoutStatus=" + commissionPayoutStatus +
                 ", commissionPayoutStatus=" + commissionPayoutStatus +
                 '}';
                 '}';
     }
     }
+
+	public Long getChannelId() {
+		return channelId;
+	}
+
+	public void setChannelId(Long channelId) {
+		this.channelId = channelId;
+	}
+
+	public String getChannelType() {
+		return channelType;
+	}
+
+	public void setChannelType(String channelType) {
+		this.channelType = channelType;
+	}
+    
 }
 }

yd-api/src/main/java/com/yd/api/agms/vo/fortune/WithdrawQueryRequestVO.java

@@ -47,5 +47,8 @@ public class WithdrawQueryRequestVO {
     private String systemFlag;
     private String systemFlag;
     private Long s3Id;
     private Long s3Id;
     private Long s2Id;
     private Long s2Id;
-    private Long s1Id;
+    private Long s1Id;    
+    private Long channelId;
+    private String channelType;
+    
 }
 }

yd-api/src/main/java/com/yd/dal/entity/agms/fortune/WithdrawQueryInfo.java

@@ -44,6 +44,7 @@ public class WithdrawQueryInfo {
      */
      */
     List<Long> subsystemIdList;
     List<Long> subsystemIdList;
     
     
+    private Long channelId;
     private String channelType;
     private String channelType;
 
 
 }
 }

yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml

@@ -310,9 +310,12 @@
         left join ag_acl_channel_new cha ON cha.customer_id = f.customer_id
         left join ag_acl_channel_new cha ON cha.customer_id = f.customer_id
         where
         where
            (setting.practitioner_type_id=28 or f.settlement_type='3')
            (setting.practitioner_type_id=28 or f.settlement_type='3')
+      	<if test="item.channelId != null">
+      		and cha.id = #{item.channelId,jdbcType=BIGINT}
+     	</if>
       	<if test="item.channelType != null">
       	<if test="item.channelType != null">
       		and f.channel_type = #{item.channelType,jdbcType=VARCHAR}
       		and f.channel_type = #{item.channelType,jdbcType=VARCHAR}
-     	</if>   
+     	</if>
         <if test="item.payoutYearmonth != null">
         <if test="item.payoutYearmonth != null">
             and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
             and pb.payout_yearmonth = #{item.payoutYearmonth,jdbcType=VARCHAR}
         </if>
         </if>