页面修改

Edu.Module.Course/ClassModule.cs

@@ -1082,6 +1082,7 @@ namespace Edu.Module.Course
                 System.Threading.Tasks.Task.Run(() => SetGoodsSpecificationValue(model));
                 #endregion
             }
+           // flag = false;
             return flag;
         }
 
@@ -1249,7 +1250,8 @@ namespace Edu.Module.Course
                                 School_Id = model.School_Id,
                                 PlanTimeList = new List<RB_Class_Time_ViewModel>(),
                                 TeacherId = model.Teacher_Id,
-                                ClassDate = newDate
+                                ClassDate = newDate,
+                                PlanType = 1
                             };
                             if (model.ClassStyle == ClassStyleEnum.Week)
                             {
@@ -1372,7 +1374,8 @@ namespace Edu.Module.Course
                             School_Id = model.School_Id,
                             PlanTimeList = new List<RB_Class_Time_ViewModel>(),
                             TeacherId = model.Teacher_Id,
-                            ClassDate = Convert.ToDateTime(item)
+                            ClassDate = Convert.ToDateTime(item),
+                            PlanType=1,
                         };
                         var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
                         if (timeList != null && timeList.Count > 0)

Edu.Module.Customer/MarketConsultantModule.cs

@@ -817,7 +817,7 @@ namespace Edu.Module.Customer
             var curMonthStuList = studentList?.Where(qitem => qitem.CreateTime.Year == end.AddDays(-1).Year && qitem.CreateTime.Month == end.AddDays(-1).Month)?.ToList();
 
             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 => qitem.Date.Year == end.AddDays(-1).Year && qitem.Date.Month == end.AddDays(-1).Month)?.ToList();
+            var yesDataList = lastList?.Where(qitem => qitem.Date.Year == end.AddDays(-1).Year && qitem.Date.Month == end.AddDays(-1).Month && qitem.Date.Day == end.AddDays(-1).Day)?.ToList();
             //当前周
             var curWeekList = lastList?.Where(qitem => Common.ConvertHelper.WeekOfYear(qitem.Date) == Common.ConvertHelper.WeekOfYear(end.AddDays(-1)))?.ToList();
             //上一周
@@ -873,8 +873,12 @@ namespace Edu.Module.Customer
 
 
             decimal LastWeekAgFollow = 0;
+            if (curWeekList != null && curWeekList.Where(qitem => qitem.LastWeekAgFollow > 0).Count() > 0)
+            {
+                LastWeekAgFollow= Math.Round(lastWeekList?.Average(qitem => qitem.LastWeekAgFollow) ?? 0, 2);
+            }
+
 
-            Math.Round(lastWeekList?.Average(qitem => qitem.LastWeekAgFollow) ?? 0, 2);
             decimal CurMonthAgFollow = 0;
             decimal LastMonthAgFollow = 0;
             if (tempDataList != null && tempDataList.Count > 0)

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -899,12 +899,12 @@ WHERE 1=1
             if (planList != null && planList.Count > 0)
             {
                 StringBuilder builder = new StringBuilder();
-                builder.AppendFormat(" INSERT INTO RB_Class_Plan(ClassId,ClassDate,Status,ClassRoomId,Group_Id,School_Id,TeacherId,BeiKeStatus,FanKuiStatus,ParentFanKuiStatus) ");
+                builder.AppendFormat(" INSERT INTO RB_Class_Plan(ClassId,ClassDate,Status,ClassRoomId,Group_Id,School_Id,TeacherId,BeiKeStatus,FanKuiStatus,ParentFanKuiStatus,PlanType) ");
                 builder.AppendFormat(" VALUES ");
                 string tempStr = "";
                 foreach (var item in planList)
                 {
-                    tempStr += $",({item.ClassId},'{Common.ConvertHelper.FormatDate(item.ClassDate)}',0,{item.ClassRoomId},{item.Group_Id},{item.School_Id},{item.TeacherId},0,0,0) ";
+                    tempStr += $",({item.ClassId},'{Common.ConvertHelper.FormatDate(item.ClassDate)}',0,{item.ClassRoomId},{item.Group_Id},{item.School_Id},{item.TeacherId},0,0,0,{item.PlanType}) ";
                 }
                 builder.Append(tempStr.TrimStart(','));
                 flag = base.Execute(builder.ToString()) > 0;

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -2672,8 +2672,7 @@ namespace Edu.WebApi.Controllers.User
             ExcelDataSource subHeader = new ExcelDataSource() { ExcelRows = new List<ExcelColumn>() };
             header.ExcelRows.Add(new ExcelColumn("员工") { Rowspan = 2, CellWidth = 15 });
             subHeader.ExcelRows.Add(new ExcelColumn());
-            header.ExcelRows.Add(new ExcelColumn("名单") { CellWidth = 15,Colspan=2 });
-            subHeader.ExcelRows.Add(new ExcelColumn("本周"));
+            header.ExcelRows.Add(new ExcelColumn("名单") { CellWidth = 25 });
             subHeader.ExcelRows.Add(new ExcelColumn("本月"));
 
             header.ExcelRows.Add(new ExcelColumn("试听") { CellWidth = 15, Colspan = 2 });