页面修改

Edu.WebApi/Controllers/User/UserController.cs

@@ -826,6 +826,7 @@ namespace Edu.WebApi.Controllers.User
             }
             query.Group_Id = base.UserInfo.Group_Id;
             string excelName = "客户资料.xls";
+            var advisorList = studentModule.GetStudentAdvisorConfigListModule(new RB_Student_AdvisorConfig_Extend() { Group_Id = base.UserInfo.Group_Id });
             var list = studentModule.GetStudentPageListModule(1, 1000000, out long rowsCount, query);
             try
             {
@@ -855,8 +856,15 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn("试听次数"){ CellWidth=10},
                         new ExcelColumn("创建时间"){ CellWidth=25},
                         new ExcelColumn("负责人"){ CellWidth=15},
+                        new ExcelColumn("期望达成协议日期"){ CellWidth=20},
+                        new ExcelColumn("胜率"){ CellWidth=20},
+                        new ExcelColumn("当前状态"){ CellWidth=20},
                     }
                 };
+                foreach (var hItem in advisorList)
+                {
+                    header.ExcelRows.Add(new ExcelColumn(hItem.Name));
+                }
                 slist.Add(header);
                 foreach (var item in list)
                 {
@@ -899,8 +907,16 @@ namespace Edu.WebApi.Controllers.User
                             new ExcelColumn(item.TrialLessonCount.ToString()),
                             new ExcelColumn(item.CreateTimeStr),
                             new ExcelColumn(item.CreateByName),
+                            new ExcelColumn(item.AdvisorExpectDate),
+                            new ExcelColumn(item.AdvisorWinRate+"%"),
+                            new ExcelColumn(item.AdvisorStatusName),
                          }
                     };
+                    foreach (var hItem in advisorList)
+                    {
+                        var tempItem = item?.AdvisorList?.Where(qitem => qitem.AdvisorStatus == hItem.Id)?.LastOrDefault()?.AdvisorDate??"";
+                        dataRow.ExcelRows.Add(new ExcelColumn(tempItem));
+                    }
                     slist.Add(dataRow);
                 }
                 var byteData = ExcelTempLateHelper.ToExcelExtend(slist);