页面修改

Edu.Module.Customer/MarketConsultantModule.cs

@@ -793,7 +793,7 @@ namespace Edu.Module.Customer
         {
             object obj = new object();
             DateTime end = Convert.ToDateTime(EndTime);
-            string newStart = Common.ConvertHelper.FormatDate(end.AddMonths(-1));
+            string newStart = Common.ConvertHelper.FormatDate(new DateTime(end.Year,end.Month,1));
             if (string.IsNullOrEmpty(EmpIds))
             {
                 var empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
@@ -976,8 +976,8 @@ namespace Edu.Module.Customer
                 CurMonthOrderNum,
                 LastMonthOrderNum,
 
-                CurWeekStu = curWeekStuList?.Select(qitem => new { qitem.StuId, qitem.StuName }),
-                CurMonthStu = curWeekStuList?.Select(qitem => new { qitem.StuId, qitem.StuName }),
+                CurWeekStu = curWeekStuList?.Count??0,
+                CurMonthStu = curMonthStuList?.Count??0,
             };
             return obj;
         }
@@ -993,7 +993,7 @@ namespace Edu.Module.Customer
         {
             List<RB_Consultant_Data_Extend> list = new List<RB_Consultant_Data_Extend>();
             DateTime end = Convert.ToDateTime(EndTime);
-            string newStart = Common.ConvertHelper.FormatDate(end.AddMonths(-1));
+            string newStart = Common.ConvertHelper.FormatDate(new DateTime(end.Year, end.Month, 1));
             if (string.IsNullOrEmpty(EmpIds))
             {
                 var empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -2672,7 +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 = 25, });
+            header.ExcelRows.Add(new ExcelColumn("名单") { CellWidth = 25,Colspan=2 });
             subHeader.ExcelRows.Add(new ExcelColumn("本周"));
             subHeader.ExcelRows.Add(new ExcelColumn("本月"));