新增字段

Edu.Model/Entity/System/RB_Channel.cs

@@ -50,5 +50,10 @@ namespace Edu.Model.Entity.System
 		/// 更新时间
 		/// </summary>
 		public DateTime UpdateTime { get; set; }
+
+		/// <summary>
+		/// 统计类型(1-普通员工统计，2-主管统计)
+		/// </summary>
+		public string StaticType { get; set; }
 	}
 }

Edu.Model/ViewModel/System/RB_Channel_Extend.cs

@@ -14,5 +14,10 @@ namespace Edu.Model.ViewModel.System
         /// 渠道编号【查询使用】
         /// </summary>
         public string QChannelIds { get; set;}
+
+        /// <summary>
+        /// 统计类型
+        /// </summary>
+        public List<string> StaticTypeList { get { return Common.ConvertHelper.StringToFileList(this.StaticType); } }
     }
 }

Edu.Module.Customer/CustomerStudentModule.cs

@@ -1131,6 +1131,7 @@ namespace Edu.Module.Customer
                     {nameof(RB_Channel_Extend.Name),model.Name },
                     {nameof(RB_Channel_Extend.UpdateBy),model.UpdateBy },
                     {nameof(RB_Channel_Extend.UpdateTime),model.UpdateTime },
+                    {nameof(RB_Channel_Extend.StaticType),model.StaticType },
                 };
                 flag = channelRepository.Update(fileds, new WhereHelper(nameof(RB_Channel_Extend.Id), model.Id));
             }

Edu.Module.Customer/MarketConsultantModule.cs

@@ -602,7 +602,7 @@ namespace Edu.Module.Customer
                 }
                 dayList.Add(tempObj);
             }
-            var yesDataList = lastList?.Where(qitem => Common.ConvertHelper.FormatMonthDay(qitem.Date) == Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)))?.ToList();
+            var yesDataList = lastList?.Where(qitem =>qitem.Date.Year== end.AddDays(-1).Year && qitem.Date.Month== end.AddDays(-1).Month)?.ToList();
             obj = new
             {
                 dayList,
@@ -667,7 +667,7 @@ namespace Edu.Module.Customer
                 QCreateByIds = EmpIds
             });
             var consultantGoal = GetConsultantGoalListModule(new RB_Consultant_Goal_Extend() { Group_Id = 100000, Dept_Id = 13, YearStr = end.Year, MonthStr = end.Month })?.FirstOrDefault();
-            var yesDataList = lastList?.Where(qitem => Common.ConvertHelper.FormatMonthDay(qitem.Date) == Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)))?.ToList();
+            var yesDataList = lastList?.Where(qitem =>qitem.Date.Year== end.AddDays(-1).Year && qitem.Date.Month== end.AddDays(-1).Month )?.ToList();
             obj = new
             {
                 DayStr = Common.ConvertHelper.FormatMonthDay(end.AddDays(-1)),

Edu.WebApi/Controllers/Customer/CustomerStudentController.cs

@@ -792,6 +792,8 @@ namespace Edu.WebApi.Controllers.Customer
                     item.Id,
                     item.Name,
                     CreateByName,
+                    item.StaticType,
+                    item.StaticTypeList,
                     CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
                 });
             }
@@ -822,6 +824,8 @@ namespace Edu.WebApi.Controllers.Customer
                     item.Id,
                     item.Name,
                     CreateByName,
+                    item.StaticType,
+                    item.StaticTypeList,
                     CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
                 });
             }
@@ -839,7 +843,15 @@ namespace Edu.WebApi.Controllers.Customer
             {
                 Id = base.ParmJObj.GetInt("Id"),
                 Name = base.ParmJObj.GetStringValue("Name"),
+           
             };
+            string staticTypes = base.ParmJObj.GetStringValue("StaticTypeList");
+            List<string> Ids = new List<string>();
+            if (!string.IsNullOrEmpty(staticTypes))
+            {
+                Ids = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(staticTypes);
+            }
+            extModel.StaticType = string.Join(",", Ids);
             extModel.Group_Id = base.UserInfo.Group_Id;
             extModel.CreateBy = base.UserInfo.Id;
             extModel.CreateTime = DateTime.Now;