渠道规则开发1(发佣检核查询)

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java

@@ -957,6 +957,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
         practitionerSubordinateInfo.setDeptId(requestVO.getInsurerBranchDeptId());
         practitionerSubordinateInfo.setDeptId(requestVO.getInsurerBranchDeptId());
         List<Long> subsystemIdList = aclPractitionerSubordinateSystemDalService.getLongs(practitionerSubordinateInfo);
         List<Long> subsystemIdList = aclPractitionerSubordinateSystemDalService.getLongs(practitionerSubordinateInfo);
         info.setSubsystemIdList(subsystemIdList);
         info.setSubsystemIdList(subsystemIdList);
+        info.setChannelType("2");//对私报表
 
 
         List<CommissionPayoutStatus> commissionPayoutStatusList = agmsFortuneDalService.commissionPayoutStatusQuery(info);
         List<CommissionPayoutStatus> commissionPayoutStatusList = agmsFortuneDalService.commissionPayoutStatusQuery(info);
 
 

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

@@ -104,6 +104,10 @@ public class CommissionPayoutStatus {
     private String monthPeriod;
     private String monthPeriod;
 
 
     private String remark;
     private String remark;
+    /**
+     * 渠道类型: 对公:1; 对私:2或者空
+     */
+    private String channelType;
 
 
     public String getCommissionPayoutYearmonth() {
     public String getCommissionPayoutYearmonth() {
         return commissionPayoutYearmonth;
         return commissionPayoutYearmonth;
@@ -283,6 +287,7 @@ public class CommissionPayoutStatus {
                 ", commissionPayoutStatus='" + commissionPayoutStatus + '\'' +
                 ", commissionPayoutStatus='" + commissionPayoutStatus + '\'' +
                 ", monthPeriod='" + monthPeriod + '\'' +
                 ", monthPeriod='" + monthPeriod + '\'' +
                 ", remark='" + remark + '\'' +
                 ", remark='" + remark + '\'' +
+                ", channelType='" + channelType + '\'' +
                 '}';
                 '}';
     }
     }
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
@@ -301,4 +306,21 @@ public class CommissionPayoutStatus {
     public void setRemark(String remark) {
     public void setRemark(String remark) {
         this.remark = remark;
         this.remark = remark;
     }
     }
+
+	/**
+	 * 渠道类型: 对公:1; 对私:2或者空
+	 * @return the channelType
+	 */
+	public String getChannelType() {
+		return channelType;
+	}
+
+	/**
+	 * 渠道类型: 对公:1; 对私:2或者空
+	 * @param channelType the channelType to set
+	 */
+	public void setChannelType(String channelType) {
+		this.channelType = channelType;
+	}
+    
 }
 }

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

@@ -64,6 +64,12 @@ public class CommissionPayoutStatusQueryInfo {
      * 体系子集id
      * 体系子集id
      */
      */
     List<Long> subsystemIdList;
     List<Long> subsystemIdList;
+    /**
+     * 渠道Id
+     */
+    private Long channelId;
+    
+    private String channelType;//渠道类型: 对公:1; 对私:2或者空
 
 
     private PageInfo<CommissionPayoutStatus> page;
     private PageInfo<CommissionPayoutStatus> page;
 
 
@@ -184,4 +190,21 @@ public class CommissionPayoutStatusQueryInfo {
     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;
+	}
+    
 }
 }