Financial/PostSyntheticalReceivableByDateRange(应收报表-查询 根据日期范围) 增加请求参数 groupName

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1870,6 +1870,11 @@ namespace OASystem.API.Controllers
                 }
             }
 
+            if (!string.IsNullOrEmpty(dto.groupName))
+            {
+                sqlWhere += string.Format(@" And di.TeamName Like '%{0}%' ", dto.groupName);
+            }
+
             #endregion
 
             //已收款项 判断如果是市场部的人员进来的话 只显示自己的 其他的都显示全部的
@@ -1886,7 +1891,7 @@ namespace OASystem.API.Controllers
             //排序倒序
             string sql = string.Format(@$"select distinct fr.diid,di.TeamName,di.ClientUnit,di.VisitDate,di.CreateTime from Fin_ForeignReceivables fr join Grp_DelegationInfo di on fr.DIID = di.id {sqlWhere}  {userSqlWhere}  Order By di.VisitDate Desc");
 
-            List<PostSyntheticalReceivableByDateRangeView> list_rst = _sqlSugar.SqlQueryable<PostSyntheticalReceivableByDateRangeView>(sql).ToList();
+            var list_rst = _sqlSugar.SqlQueryable<PostSyntheticalReceivableByDateRangeView>(sql).ToList();
 
             var setData = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.IsDel == 0).ToList();
 

OASystem/OASystem.Domain/Dtos/Financial/PostSyntheticalReceivableByDateRangeDto.cs

@@ -13,6 +13,11 @@ namespace OASystem.Domain.Dtos.Financial
         public string beginDt { get; set; }
         public string endDt { get; set; }
 
+        /// <summary>
+        /// 团组名称
+        /// </summary>
+        public string groupName { get; set; }
+
         /// <summary>
         /// 请求类型：1:查询数据,2:生成Excel
         /// </summary>