页面修改

Edu.Model/ViewModel/Customer/RB_Customer_Remit_Extend.cs

@@ -47,5 +47,10 @@ namespace Edu.Model.ViewModel.Customer
         /// 同业电话
         /// </summary>
         public string CustomerImage { get; set; }
+
+        /// <summary>
+        /// 同业编号
+        /// </summary>
+        public int CategoryId { get; set; }
     }
 }

Edu.Model/ViewModel/Sell/RB_Order_ReturnComission_ViewModel.cs

@@ -63,5 +63,10 @@ namespace Edu.Model.ViewModel.Sell
         /// 关联人员名称
         /// </summary>
         public string OrderSourceIdName { get; set; }
+
+        /// <summary>
+        /// 同行编号
+        /// </summary>
+        public int CategoryId { get; set; }
     }
 }

Edu.Repository/Customer/RB_Customer_RemitRepository.cs

@@ -49,6 +49,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Remit_Extend.AuditStatus), query.AuditStatus);
                 }
+                if (query.CategoryId > 0)
+                {
+                    builder.AppendFormat(" AND C.{0}={1} ", nameof(RB_Customer_Remit_Extend.CategoryId), query.CategoryId);
+                }
             }
             builder.AppendFormat(" order by A.Id desc");
             return GetPage<RB_Customer_Remit_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs

@@ -137,13 +137,19 @@ namespace Edu.Repository.Sell
             {
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.Status)} in(1,2)";
             }
-            
 
-            string sql = $@" select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName from RB_Order_ReturnComission r 
-left join rb_returnmoney_batch b on r.BatchId = b.Id
-left join rb_order o on r.OrderId = o.OrderId
-left join rb_class c on o.ClassId = c.ClassId
-left join rb_student s on s.StuId = r.StuId
+            if (demodel.CategoryId > 0)
+            {
+                where += $@" and cus.{nameof(RB_Order_ReturnComission_ViewModel.CategoryId)}={demodel.CategoryId} ";
+            }
+
+            string sql = $@" 
+select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName 
+from RB_Order_ReturnComission r left join rb_returnmoney_batch b on r.BatchId = b.Id
+     left join rb_order o on r.OrderId = o.OrderId
+     left join rb_class c on o.ClassId = c.ClassId
+     left join rb_student s on s.StuId = r.StuId
+     LEFT JOIN rb_customer AS cus ON r.OrderSourceType=2 AND r.OrderSourceId=cus.CustomerId
 where {where} order by r.Id desc";
             return GetPage<RB_Order_ReturnComission_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
         }
@@ -261,10 +267,16 @@ from RB_Order_ReturnComission r where {where} group by r.OrderSourceType,r.Order
                 where += $@" and r.{nameof(RB_Order_ReturnComission_ViewModel.Status)} in(1,2)";
             }
 
+            if (demodel.CategoryId > 0)
+            {
+                where += $@" and cus.{nameof(RB_Order_ReturnComission_ViewModel.CategoryId)} ={demodel.CategoryId}";
+            }
 
-            string sql = $@" select sum(r.CommissionMoeny) from RB_Order_ReturnComission r 
-left join rb_order o on r.OrderId = o.OrderId
-where {where}";
+            string sql = $@" 
+SELECT SUM(r.CommissionMoeny) 
+FROM RB_Order_ReturnComission r left join rb_order o on r.OrderId = o.OrderId
+     LEFT JOIN rb_customer AS cus ON r.OrderSourceType=2 AND r.OrderSourceId=cus.CustomerId    
+WHERE {where}";
             var obj = ExecuteScalar(sql);
             return obj == null ? 0 : Convert.ToDecimal(obj);
         }